Unreviewed, EFL css2.1 rebaseline after r101343.

* platform/efl/css2.1/20110323/absolute-non-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-006-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-010-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-011-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-height-012-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-002-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-003-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-004-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-005-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-007-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-008-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-009-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-011-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-012-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-013-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-014-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-015-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-016-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-017-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-018-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-020-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-021-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-022-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-023-expected.txt:
* platform/efl/css2.1/20110323/absolute-non-replaced-width-024-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt:
* platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt:
* platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt:
* platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt:
* platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt:
* platform/efl/css2.1/20110323/height-width-table-001-expected.txt:
* 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.txt:
* 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.txt:
* 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.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt:
* platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-008-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt:
* platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt:
* platform/efl/css2.1/20110323/replaced-elements-001-expected.txt:
* platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt:
* platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt:
* platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt:
* platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt:
* platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt:
* platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.txt:
* platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt:
* platform/efl/css2.1/t010403-shand-border-00-c-expected.txt:
* platform/efl/css2.1/t010403-shand-font-00-b-expected.txt:
* platform/efl/css2.1/t010403-shand-font-01-b-expected.txt:
* platform/efl/css2.1/t010403-shand-font-02-b-expected.txt:
* platform/efl/css2.1/t010403-shand-font-03-b-expected.txt:
* platform/efl/css2.1/t040102-keywords-00-b-expected.txt:
* platform/efl/css2.1/t040102-keywords-01-b-expected.txt:
* platform/efl/css2.1/t040103-case-00-b-expected.txt:
* platform/efl/css2.1/t040103-case-01-c-expected.txt:
* platform/efl/css2.1/t040103-escapes-00-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-01-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-02-d-expected.txt:
* platform/efl/css2.1/t040103-escapes-03-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-04-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-05-c-expected.txt:
* platform/efl/css2.1/t040103-escapes-06-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-07-b-expected.txt:
* platform/efl/css2.1/t040103-escapes-08-b-expected.txt:
* platform/efl/css2.1/t040103-ident-00-c-expected.txt:
* platform/efl/css2.1/t040103-ident-01-c-expected.txt:
* platform/efl/css2.1/t040103-ident-02-c-expected.txt:
* platform/efl/css2.1/t040103-ident-03-c-expected.txt:
* platform/efl/css2.1/t040103-ident-04-c-expected.txt:
* platform/efl/css2.1/t040103-ident-05-c-expected.txt:
* platform/efl/css2.1/t040103-ident-06-c-expected.txt:
* platform/efl/css2.1/t040103-ident-07-c-expected.txt:
* platform/efl/css2.1/t040103-ident-08-c-expected.txt:
* platform/efl/css2.1/t040103-ident-09-c-expected.txt:
* platform/efl/css2.1/t040103-ident-10-c-expected.txt:
* platform/efl/css2.1/t040103-ident-11-c-expected.txt:
* platform/efl/css2.1/t040103-ident-12-c-expected.txt:
* platform/efl/css2.1/t040103-ident-13-c-expected.txt:
* platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt:
* platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt:
* platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt:
* platform/efl/css2.1/t040105-atrule-00-b-expected.txt:
* platform/efl/css2.1/t040105-atrule-01-b-expected.txt:
* platform/efl/css2.1/t040105-atrule-02-b-expected.txt:
* platform/efl/css2.1/t040105-atrule-03-b-expected.txt:
* platform/efl/css2.1/t040105-atrule-04-b-expected.txt:
* platform/efl/css2.1/t040105-import-00-b-expected.txt:
* platform/efl/css2.1/t040105-import-01-b-expected.txt:
* platform/efl/css2.1/t040105-import-10-b-expected.txt:
* platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt:
* platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt:
* platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt:
* platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt:
* platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt:
* platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt:
* platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-01-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-02-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-03-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-04-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-05-f-expected.txt:
* platform/efl/css2.1/t0402-syntax-06-f-expected.txt:
* platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt:
* platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.txt:
* platform/efl/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt:
* platform/efl/css2.1/t040303-c62-percent-00-b-ag-expected.txt:
* platform/efl/css2.1/t040304-c64-uri-00-a-g-expected.txt:
* platform/efl/css2.1/t040306-c63-color-00-b-ag-expected.txt:
* platform/efl/css2.1/t040306-syntax-01-f-expected.txt:
* platform/efl/css2.1/t040307-syntax-01-b-expected.txt:
* platform/efl/css2.1/t050201-c12-grouping-00-b-expected.txt:
* platform/efl/css2.1/t0505-c16-descendant-00-e-expected.txt:
* platform/efl/css2.1/t0505-c16-descendant-01-e-expected.txt:
* platform/efl/css2.1/t0505-c16-descendant-02-e-expected.txt:
* platform/efl/css2.1/t050803-c14-classes-00-e-expected.txt:
* platform/efl/css2.1/t0509-c15-ids-00-a-expected.txt:
* platform/efl/css2.1/t0509-c15-ids-01-e-expected.txt:
* platform/efl/css2.1/t0509-id-sel-syntax-01-f-expected.txt:
* platform/efl/css2.1/t0509-id-sel-syntax-02-b-expected.txt:
* platform/efl/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt:
* platform/efl/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt:
* platform/efl/css2.1/t0511-c21-pseud-link-00-e-expected.txt:
* platform/efl/css2.1/t0511-c21-pseud-link-01-e-expected.txt:
* platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt:
* platform/efl/css2.1/t0511-c21-pseud-link-03-e-expected.txt:
* platform/efl/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt:
* platform/efl/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt:
* platform/efl/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt:
* platform/efl/css2.1/t051103-dom-hover-01-c-io-expected.txt:
* platform/efl/css2.1/t051103-dom-hover-02-c-io-expected.txt:
* platform/efl/css2.1/t0602-c13-inh-underlin-00-e-expected.txt:
* platform/efl/css2.1/t0602-c13-inheritance-00-e-expected.txt:
* platform/efl/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt:
* platform/efl/css2.1/t0603-c11-import-00-b-expected.txt:
* platform/efl/css2.1/t060401-c32-cascading-00-b-expected.txt:
* platform/efl/css2.1/t060402-c31-important-00-b-expected.txt:
* platform/efl/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt:
* platform/efl/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt:
* platform/efl/css2.1/t0801-c412-hz-box-00-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt:
* platform/efl/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt:
* platform/efl/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt:
* platform/efl/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt:
* platform/efl/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt:
* platform/efl/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt:
* platform/efl/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt:
* platform/efl/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt:
* platform/efl/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt:
* platform/efl/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt:
* platform/efl/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt:
* platform/efl/css2.1/t0803-c5505-mrgn-02-c-expected.txt:
* platform/efl/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt:
* platform/efl/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt:
* platform/efl/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt:
* platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt:
* platform/efl/css2.1/t0804-c5507-padn-r-02-f-expected.txt:
* platform/efl/css2.1/t0804-c5507-padn-r-03-f-expected.txt:
* platform/efl/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt:
* platform/efl/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt:
* platform/efl/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt:
* platform/efl/css2.1/t0804-c5509-padn-l-02-f-expected.txt:
* platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt:
* platform/efl/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5510-padn-00-b-ag-expected.txt:
* platform/efl/css2.1/t0804-c5510-padn-01-e-a-expected.txt:
* platform/efl/css2.1/t0804-c5510-padn-02-f-expected.txt:
* platform/efl/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt:
* platform/efl/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt:
* platform/efl/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt:
* platform/efl/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt:
* platform/efl/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt:
* platform/efl/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt:
* platform/efl/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt:
* platform/efl/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt:
* platform/efl/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5515-brdr-w-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5515-brdr-w-02-b-expected.txt:
* platform/efl/css2.1/t0805-c5515-ibrdr-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5516-brdr-c-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5517-brdr-s-00-c-expected.txt:
* platform/efl/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5518-brdr-t-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5518-brdr-t-01-e-expected.txt:
* platform/efl/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5519-brdr-r-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5519-brdr-r-02-e-expected.txt:
* platform/efl/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5520-brdr-b-01-e-expected.txt:
* platform/efl/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5521-brdr-l-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5521-brdr-l-02-e-expected.txt:
* platform/efl/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt:
* platform/efl/css2.1/t0805-c5522-brdr-00-b-expected.txt:
* platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt:
* platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt:
* platform/efl/css2.1/t0805-c5522-ibrdr-00-a-expected.txt:
* platform/efl/css2.1/t090204-display-change-01-b-ao-expected.txt:
* platform/efl/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-00-d-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-01-d-g-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-02-c-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-03-c-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-04-c-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-fit-00-d-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt:
* platform/efl/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltblck-01-d-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
* platform/efl/css2.1/t0905-c5525-flthw-00-c-g-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt:
* platform/efl/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt:
* platform/efl/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt:
* platform/efl/css2.1/t0905-c5526-flthw-00-c-g-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-02-d-g-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-03-b-g-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-ln-00-d-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-ln-02-d-expected.txt:
* platform/efl/css2.1/t090501-c414-flt-ln-03-d-expected.txt:
* platform/efl/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt:
* platform/efl/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt:
* platform/efl/css2.1/t1002-c5523-width-00-b-g-expected.txt:
* platform/efl/css2.1/t1002-c5523-width-01-b-g-expected.txt:
* platform/efl/css2.1/t1002-c5523-width-02-b-g-expected.txt:
* platform/efl/css2.1/t100303-c412-blockw-00-d-ag-expected.txt:
* platform/efl/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt:
* platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt:
* platform/efl/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt:
* platform/efl/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt:
* platform/efl/css2.1/t1004-c5524-width-00-b-g-expected.txt:
* platform/efl/css2.1/t1005-c5524-width-00-b-g-expected.txt:
* platform/efl/css2.1/t1005-c5524-width-01-b-g-expected.txt:
* platform/efl/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt:
* platform/efl/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt:
* platform/efl/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt:
* platform/efl/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt:
* platform/efl/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt:
* platform/efl/css2.1/t100801-c544-valgn-00-a-ag-expected.txt:
* platform/efl/css2.1/t100801-c544-valgn-01-d-ag-expected.txt:
* platform/efl/css2.1/t100801-c544-valgn-02-d-agi-expected.txt:
* platform/efl/css2.1/t100801-c544-valgn-03-d-agi-expected.txt:
* platform/efl/css2.1/t100801-c544-valgn-04-d-agi-expected.txt:
* platform/efl/css2.1/t100801-c548-leadin-00-d-a-expected.txt:
* platform/efl/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt:
* platform/efl/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt:
* platform/efl/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt:
* platform/efl/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt:
* platform/efl/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt:
* platform/efl/css2.1/t1202-counter-00-b-expected.txt:
* platform/efl/css2.1/t1202-counter-01-b-expected.txt:
* platform/efl/css2.1/t1202-counter-02-b-expected.txt:
* platform/efl/css2.1/t1202-counter-03-b-expected.txt:
* platform/efl/css2.1/t1202-counter-04-b-expected.txt:
* platform/efl/css2.1/t1202-counter-05-b-expected.txt:
* platform/efl/css2.1/t1202-counter-06-b-expected.txt:
* platform/efl/css2.1/t1202-counter-07-b-expected.txt:
* platform/efl/css2.1/t1202-counter-08-b-expected.txt:
* platform/efl/css2.1/t1202-counter-09-b-expected.txt:
* platform/efl/css2.1/t1202-counter-11-b-expected.txt:
* platform/efl/css2.1/t1202-counter-12-b-expected.txt:
* platform/efl/css2.1/t1202-counter-13-b-expected.txt:
* platform/efl/css2.1/t1202-counter-14-b-expected.txt:
* platform/efl/css2.1/t1202-counter-15-b-expected.txt:
* platform/efl/css2.1/t1202-counter-16-f-expected.txt:
* platform/efl/css2.1/t1202-counters-00-b-expected.txt:
* platform/efl/css2.1/t1202-counters-01-b-expected.txt:
* platform/efl/css2.1/t1202-counters-02-b-expected.txt:
* platform/efl/css2.1/t1202-counters-03-b-expected.txt:
* platform/efl/css2.1/t1202-counters-04-b-expected.txt:
* platform/efl/css2.1/t1202-counters-05-b-expected.txt:
* platform/efl/css2.1/t1202-counters-06-b-expected.txt:
* platform/efl/css2.1/t1202-counters-07-b-expected.txt:
* platform/efl/css2.1/t1202-counters-08-b-expected.txt:
* platform/efl/css2.1/t1202-counters-09-b-expected.txt:
* platform/efl/css2.1/t1202-counters-11-b-expected.txt:
* platform/efl/css2.1/t1202-counters-12-b-expected.txt:
* platform/efl/css2.1/t1202-counters-13-b-expected.txt:
* platform/efl/css2.1/t1202-counters-14-b-expected.txt:
* platform/efl/css2.1/t1202-counters-15-b-expected.txt:
* platform/efl/css2.1/t1202-counters-16-c-expected.txt:
* platform/efl/css2.1/t1202-counters-17-d-expected.txt:
* platform/efl/css2.1/t1202-counters-18-f-expected.txt:
* platform/efl/css2.1/t1204-implied-00-b-expected.txt:
* platform/efl/css2.1/t1204-implied-01-c-expected.txt:
* platform/efl/css2.1/t1204-implied-02-d-expected.txt:
* platform/efl/css2.1/t1204-multiple-00-c-expected.txt:
* platform/efl/css2.1/t1204-multiple-01-c-expected.txt:
* platform/efl/css2.1/t1204-order-00-c-expected.txt:
* platform/efl/css2.1/t1204-order-01-d-expected.txt:
* platform/efl/css2.1/t1204-root-e-expected.txt:
* platform/efl/css2.1/t120401-scope-00-b-expected.txt:
* platform/efl/css2.1/t120401-scope-01-c-expected.txt:
* platform/efl/css2.1/t120401-scope-02-c-expected.txt:
* platform/efl/css2.1/t120401-scope-03-c-expected.txt:
* platform/efl/css2.1/t120401-scope-04-d-expected.txt:
* platform/efl/css2.1/t120403-content-none-00-c-expected.txt:
* platform/efl/css2.1/t120403-display-none-00-c-expected.txt:
* platform/efl/css2.1/t120403-visibility-00-c-expected.txt:
* platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt:
* platform/efl/css2.1/t1205-c563-list-type-00-b-expected.txt:
* platform/efl/css2.1/t1205-c563-list-type-01-b-expected.txt:
* platform/efl/css2.1/t1205-c564-list-img-00-b-g-expected.txt:
* platform/efl/css2.1/t1205-c565-list-pos-00-b-expected.txt:
* platform/efl/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
* platform/efl/css2.1/t1401-c531-color-00-a-expected.txt:
* platform/efl/css2.1/t1402-c45-bg-canvas-00-b-expected.txt:
* platform/efl/css2.1/t140201-c532-bgcolor-00-a-expected.txt:
* platform/efl/css2.1/t140201-c532-bgcolor-01-b-expected.txt:
* platform/efl/css2.1/t140201-c533-bgimage-00-a-expected.txt:
* platform/efl/css2.1/t140201-c533-bgimage-01-b-g-expected.txt:
* platform/efl/css2.1/t140201-c534-bgre-00-b-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgre-01-b-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt:
* platform/efl/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt:
* platform/efl/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt:
* platform/efl/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt:
* platform/efl/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt:
* platform/efl/css2.1/t1503-c522-font-family-00-b-expected.txt:
* platform/efl/css2.1/t1504-c523-font-style-00-b-expected.txt:
* platform/efl/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt:
* platform/efl/css2.1/t1505-c524-font-var-00-b-expected.txt:
* platform/efl/css2.1/t1506-c525-font-wt-00-b-expected.txt:
* platform/efl/css2.1/t1507-c526-font-sz-01-b-a-expected.txt:
* platform/efl/css2.1/t1507-c526-font-sz-02-b-a-expected.txt:
* platform/efl/css2.1/t1507-c526-font-sz-03-f-a-expected.txt:
* platform/efl/css2.1/t1601-c547-indent-00-b-a-expected.txt:
* platform/efl/css2.1/t1601-c547-indent-01-d-expected.txt:
* platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt:
* platform/efl/css2.1/t1602-c546-txt-align-00-b-expected.txt:
* platform/efl/css2.1/t1604-c541-word-sp-00-b-a-expected.txt:
* platform/efl/css2.1/t1604-c541-word-sp-01-b-a-expected.txt:
* platform/efl/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt:
* platform/efl/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt:
* platform/efl/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt:
* platform/efl/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-00-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-01-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-02-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-03-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-04-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-05-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-06-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-07-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-08-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-10-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-11-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-12-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-13-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-14-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-15-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-16-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-17-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-19-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-20-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-21-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-22-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-23-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-24-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-25-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-26-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-27-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-28-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-29-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-30-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-31-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-32-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-33-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-34-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-35-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-36-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-37-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-38-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-39-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-40-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-41-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-42-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-43-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-44-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-45-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-46-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-47-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-48-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-49-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-50-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-51-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-52-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-53-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-54-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-55-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-56-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-57-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-58-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-59-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-60-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-61-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-62-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-63-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-64-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-65-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-66-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-67-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-68-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-70-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-71-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-72-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-73-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-74-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-75-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-76-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-77-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-78-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-79-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-81-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-82-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-83-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-84-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-85-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-87-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-88-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-89-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-90-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-91-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-92-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-93-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-94-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-95-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-96-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-97-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-98-d-expected.txt:
* platform/efl/css2.1/t170602-bdr-conflct-w-99-d-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106178 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-001-expected.txt
index dd18734..2111267 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-001-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x19
-  RenderBlock {HTML} at (0,0) size 800x19
-    RenderBody {BODY} at (0,0) size 800x19
-      RenderBlock {P} at (0,0) size 800x19
+layer at (0,0) size 800x18
+  RenderBlock {HTML} at (0,0) size 800x18
+    RenderBody {BODY} at (0,0) size 800x18
+      RenderBlock {P} at (0,0) size 800x18
         RenderText {#text} at (0,0) size 511x19
           text run at (0,0) width 511: "Test passes the a filled blue square touches the upper-left corner of the black box."
 layer at (0,96) size 294x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-002-expected.txt
index 5b1ef3f..a9485fc 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-002-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 723x19
           text run at (0,0) width 723: "Test passes if the blue box below is in the upper-left corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-003-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-003-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-004-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-004-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-005-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-005-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-006-expected.txt
index a0f1048..c4167af 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-006-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x379
-  RenderBlock {HTML} at (0,0) size 800x379
-    RenderBody {BODY} at (8,16) size 784x355
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x378
+  RenderBlock {HTML} at (0,0) size 800x378
+    RenderBody {BODY} at (8,16) size 784x354
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 300x19
           text run at (0,0) width 300: "Test passes if there is one blue box on the page."
-layer at (8,51) size 320x320 clip at (18,61) size 300x300
-  RenderBlock (relative positioned) {DIV} at (0,35) size 320x320 [border: (10px solid #000000)]
-layer at (18,161) size 150x150
+layer at (8,50) size 320x320 clip at (18,60) size 300x300
+  RenderBlock (relative positioned) {DIV} at (0,34) size 320x320 [border: (10px solid #000000)]
+layer at (18,160) size 150x150
   RenderBlock (positioned) {DIV} at (10,110) size 150x150 [bgcolor=#0000FF]
-layer at (168,161) size 150x150
+layer at (168,160) size 150x150
   RenderBlock (positioned) {DIV} at (160,110) size 150x150 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-007-expected.txt
index 4b04f80..ca1d5fdb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-007-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x443
-  RenderBlock {HTML} at (0,0) size 800x443
-    RenderBody {BODY} at (8,16) size 784x419
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x442
+  RenderBlock {HTML} at (0,0) size 800x442
+    RenderBody {BODY} at (8,16) size 784x418
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 425x19
           text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height."
-layer at (8,51) size 192x384
-  RenderBlock (relative positioned) {DIV} at (0,35) size 192x384 [color=#FFA500]
-layer at (8,51) size 192x96
+layer at (8,50) size 192x384
+  RenderBlock (relative positioned) {DIV} at (0,34) size 192x384 [color=#FFA500]
+layer at (8,50) size 192x96
   RenderBlock (positioned) {DIV} at (0,0) size 192x96 [bgcolor=#0000FF]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-008-expected.txt
index 2a3794b..347a9ec 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-008-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (8,16) size 784x323
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x346
+  RenderBlock {HTML} at (0,0) size 800x346
+    RenderBody {BODY} at (8,16) size 784x322
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 469x19
           text run at (0,0) width 469: "Test passes if there are two boxes below, a blue box below an orange box."
-layer at (8,51) size 96x288
-  RenderBlock (relative positioned) {DIV} at (0,35) size 96x288 [bgcolor=#0000FF]
-layer at (8,51) size 96x96
+layer at (8,50) size 96x288
+  RenderBlock (relative positioned) {DIV} at (0,34) size 96x288 [bgcolor=#0000FF]
+layer at (8,50) size 96x96
   RenderBlock (positioned) {DIV} at (0,0) size 96x96 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt
index 51ece64..fc10ffd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-009-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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 425x19
           text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height."
-layer at (8,75) size 192x96
+layer at (8,74) size 192x96
   RenderBlock (positioned) {DIV} at (0,24) size 192x96 [color=#FFA500] [bgcolor=#0000FF]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-010-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-010-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-011-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-011-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-012-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-height-012-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt
index 3f84b76..a50512d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x19
-  RenderBlock {HTML} at (0,0) size 800x19
-    RenderBody {BODY} at (0,0) size 800x19
-      RenderBlock {P} at (0,0) size 800x19
+layer at (0,0) size 800x18
+  RenderBlock {HTML} at (0,0) size 800x18
+    RenderBody {BODY} at (0,0) size 800x18
+      RenderBlock {P} at (0,0) size 800x18
         RenderText {#text} at (0,0) size 425x19
           text run at (0,0) width 425: "Test passes the blue box is in the upper-left corner of the black box."
-layer at (0,19) size 198x198
-  RenderBlock (positioned) {DIV} at (0,19) size 198x198 [border: (3px solid #000000)]
-layer at (3,22) size 96x48
-  RenderBlock (positioned) {DIV} at (3,22) size 96x48 [bgcolor=#0000FF]
+layer at (0,18) size 198x198
+  RenderBlock (positioned) {DIV} at (0,18) size 198x198 [border: (3px solid #000000)]
+layer at (3,21) size 96x48
+  RenderBlock (positioned) {DIV} at (3,21) size 96x48 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt
index 1946cce..b8282f6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 607x19
           text run at (0,0) width 607: "Test passes if there is blue rectangle, and not a square, in the upper-right corner of the black box."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x48
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x48
   RenderBlock (positioned) {DIV} at (99,3) size 96x48 [bgcolor=#0000FF]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: " "
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt
index 4961e01..94806dd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,174) size 288x48
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,173) size 288x48
   RenderBlock (positioned) {DIV} at (3,123) size 288x48 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt
index e4b91bf..b1127a8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x443
-  RenderBlock {HTML} at (0,0) size 800x443
-    RenderBody {BODY} at (8,16) size 784x419
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x442
+  RenderBlock {HTML} at (0,0) size 800x442
+    RenderBody {BODY} at (8,16) size 784x418
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 425x19
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 96x384
-  RenderBlock (relative positioned) {DIV} at (0,35) size 96x384
-layer at (8,99) size 96x48
+layer at (8,50) size 96x384
+  RenderBlock (relative positioned) {DIV} at (0,34) size 96x384
+layer at (8,98) size 96x48
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x48 [bgcolor=#FFA500]
-layer at (8,99) size 48x48
+layer at (8,98) size 48x48
   RenderBlock (positioned) {DIV} at (0,48) size 48x48 [bgcolor=#0000FF]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: " "
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt
index 79997ad..831456b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (8,16) size 784x323
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x346
+  RenderBlock {HTML} at (0,0) size 800x346
+    RenderBody {BODY} at (8,16) size 784x322
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 469x19
           text run at (0,0) width 469: "Test passes if there are two boxes below, a blue box below an orange box."
-layer at (8,51) size 96x288
-  RenderBlock (relative positioned) {DIV} at (0,35) size 96x288 [bgcolor=#0000FF]
-layer at (8,51) size 96x48
+layer at (8,50) size 96x288
+  RenderBlock (relative positioned) {DIV} at (0,34) size 96x288 [bgcolor=#0000FF]
+layer at (8,50) size 96x48
   RenderBlock (positioned) {DIV} at (0,0) size 96x48 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt
index ca40204..8830fec 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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 425x19
           text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height."
-layer at (104,75) size 96x48
+layer at (104,74) size 96x48
   RenderBlock (positioned) {DIV} at (96,24) size 96x48 [bgcolor=#0000FF]
-layer at (8,75) size 96x48
+layer at (8,74) size 96x48
   RenderBlock (positioned) {DIV} at (0,24) size 96x48 [bgcolor=#FFA500]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: " "
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt
index 4961e01..94806dd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,174) size 288x48
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,173) size 288x48
   RenderBlock (positioned) {DIV} at (3,123) size 288x48 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt
index 1c9082c..de33d39 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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 408x19
           text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box."
-layer at (8,51) size 294x294
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x294 [border: (3px solid #000000)]
-layer at (11,150) size 288x96
+layer at (8,50) size 294x294
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)]
+layer at (11,149) size 288x96
   RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-001-expected.txt
index 8873a46..010e74a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-001-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-002-expected.txt
index 41887ef..446cfd9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-002-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 689x19
           text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-003-expected.txt
index 1bc84f6..4cd62bb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-003-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 741x19
           text run at (0,0) width 741: "Test passes if the blue square in in the upper-right corner of the black rectangle and there is no red visible on the page."
-layer at (8,51) size 390x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 390x198 [border: (3px solid #000000)]
-layer at (299,54) size 96x96
+layer at (8,50) size 390x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 390x198 [border: (3px solid #000000)]
+layer at (299,53) size 96x96
   RenderBlock (positioned) {DIV} at (291,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-004-expected.txt
index 5641ea5..7aa81b1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-004-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 686x19
           text run at (0,0) width 686: "Test passes if the blue box fills the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-005-expected.txt
index e497b43..44769c1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-005-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 677x19
           text run at (0,0) width 677: "Test passes if the blue box fills the upper-left corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-006-expected.txt
index 41887ef..446cfd9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-006-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 689x19
           text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-007-expected.txt
index 8873a46..010e74a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-007-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-008-expected.txt
index 8bfb502..f4ddd71 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-008-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 730x19
           text run at (0,0) width 730: "Test passes if the blue square is in the upper-left corner of the black rectangle and there is no red visible on the page."
-layer at (8,51) size 294x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 294x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-009-expected.txt
index 58882cb..abfbee6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-009-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 739x19
           text run at (0,0) width 739: "Test passes if the blue square is in the upper-right corner of the black rectangle and there is no red visible on the page."
-layer at (8,51) size 294x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x198 [border: (3px solid #000000)]
-layer at (203,54) size 96x96
+layer at (8,50) size 294x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)]
+layer at (203,53) size 96x96
   RenderBlock (positioned) {DIV} at (195,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
index 8873a46..010e74a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-010-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-011-expected.txt
index 8873a46..010e74a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-011-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-012-expected.txt
index 41887ef..446cfd9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-012-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 689x19
           text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-013-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-013-expected.txt
index 41887ef..446cfd9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-013-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-013-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 689x19
           text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-014-expected.txt
index 8873a46..010e74a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-014-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-014-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (11,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (11,53) size 96x96
   RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-015-expected.txt
index f313d46..446def2 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-015-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 669x19
           text run at (0,0) width 669: "Test passes if the blue box is horizontally centered inside black box and there is no red visible on the page."
-layer at (8,51) size 294x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 294x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 294x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-016-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-016-expected.txt
index 41887ef..446cfd9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-016-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-016-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 689x19
           text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page."
-layer at (8,51) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
-layer at (107,54) size 96x96
+layer at (8,50) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
+layer at (107,53) size 96x96
   RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
     RenderText {#text} at (0,0) size 96x97
       text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-017-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-017-expected.txt
index 6176139..3309614 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-017-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-017-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x68
+  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 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-layer at (8,70) size 128x128
-  RenderBlock (positioned) {DIV} at (8,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
+layer at (8,68) size 128x128
+  RenderBlock (positioned) {DIV} at (8,68) 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"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-018-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-018-expected.txt
index ae032f0..ca1084c7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-018-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-018-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x68
+  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 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-layer at (8,70) size 128x128
-  RenderBlock (positioned) {DIV} at (8,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
+layer at (8,68) size 128x128
+  RenderBlock (positioned) {DIV} at (8,68) 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"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
index f737020..8498e3b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-019-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x68
+  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 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-layer at (8,70) size 128x128
-  RenderBlock (positioned) {DIV} at (8,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
+layer at (8,68) size 128x128
+  RenderBlock (positioned) {DIV} at (8,68) 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"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-020-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-020-expected.txt
index 2239632..d9a0df6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-020-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-020-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x68
+  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 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-layer at (8,70) size 128x128
-  RenderBlock (positioned) {DIV} at (8,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
+layer at (8,68) size 128x128
+  RenderBlock (positioned) {DIV} at (8,68) 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"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-021-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-021-expected.txt
index afc836e..8c613ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-021-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-021-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x68
+  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 774x37
           text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal"
-          text run at (0,19) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
-layer at (664,70) size 128x128
-  RenderBlock (positioned) {DIV} at (664,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
+layer at (664,68) size 128x128
+  RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000]
     RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000]
       RenderText {#text} at (-128,47) size 256x33
         text run at (-128,47) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-022-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-022-expected.txt
index 097964e..63659b7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-022-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-022-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x68
+  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 774x37
           text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal"
-          text run at (0,19) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
-layer at (664,70) size 128x128
-  RenderBlock (positioned) {DIV} at (664,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
+layer at (664,68) size 128x128
+  RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000]
     RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000]
       RenderText {#text} at (-128,47) size 256x33
         text run at (-128,47) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-023-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-023-expected.txt
index 719e389..913ad13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-023-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-023-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x68
+  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 774x37
           text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal"
-          text run at (0,19) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
-layer at (664,70) size 128x128
-  RenderBlock (positioned) {DIV} at (664,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
+layer at (664,68) size 128x128
+  RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000]
     RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
       RenderText {#text} at (-128,47) size 256x33
         text run at (-128,47) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-024-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-024-expected.txt
index a694977..12f4294 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-024-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-non-replaced-width-024-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x68
+  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 774x37
           text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal"
-          text run at (0,19) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
-layer at (664,70) size 128x128
-  RenderBlock (positioned) {DIV} at (664,70) size 128x128 [bgcolor=#FF0000]
+          text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page."
+layer at (664,68) size 128x128
+  RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000]
     RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000]
       RenderText {#text} at (-128,47) size 256x33
         text run at (-128,47) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-001-expected.txt
index 8ee2043..ae0cb96 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-001-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x80
-  RenderBlock {HTML} at (0,0) size 800x80
-    RenderBody {BODY} at (8,16) size 784x56
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x79
+  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
           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,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
-layer at (8,54) size 15x15
-  RenderImage {IMG} at (8,54) size 15x15
+      RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+layer at (8,53) size 15x15
+  RenderImage {IMG} at (8,53) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-002-expected.txt
index 23ef811..2f42726 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-002-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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 425x19
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 15x15
+layer at (8,50) size 15x15
   RenderImage {IMG} at (0,0) size 15x15
-layer at (23,51) size 15x15
+layer at (23,50) size 15x15
   RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-003-expected.txt
index 6f5b01f..513b393 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-003-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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 425x19
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 96x96
+layer at (8,50) size 96x96
   RenderImage {IMG} at (0,0) size 96x96
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-004-expected.txt
index 86cbc24..bd060ab 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-004-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-005-expected.txt
index f177582..a846ca4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-005-expected.txt
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,51) size 306x102
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,50) size 306x102
   RenderPartObject {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x96
       RenderView at (0,0) size 300x96
     layer at (0,0) size 300x96
       RenderBlock {HTML} at (0,0) size 300x96
         RenderBody {BODY} at (8,8) size 284x80
-layer at (8,51) size 306x102
+layer at (8,50) size 306x102
   RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)]
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 2c756e3..0c6bd60 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 306x6
+layer at (8,50) size 306x6
   RenderPartObject {IFRAME} at (0,0) size 306x6 [border: (3px solid #FF0000)]
     layer at (0,0) size 285x8
       RenderView at (0,0) size 285x0
     layer at (0,0) size 285x8
       RenderBlock {HTML} at (0,0) size 285x8
         RenderBody {BODY} at (8,8) size 269x0
-layer at (8,51) size 306x6
+layer at (8,50) size 306x6
   RenderBlock (positioned) {DIV} at (0,0) size 306x6 [border: (3px solid #008000)]
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 76f05ba..3acbe1b 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x77
-  RenderBlock {HTML} at (0,0) size 800x77
-    RenderBody {BODY} at (8,16) size 784x53
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x76
+  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
           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,51) size 784x18
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x18 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x18
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF]
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 49cddac..71c617f 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF]
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 5ccdff0..f06a8b4 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 96x96
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 96x96
   RenderImage {IMG} at (0,99) size 96x96
-layer at (104,150) size 96x96
+layer at (104,149) size 96x96
   RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF]
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 c3c3791..1440bd0 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)]
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 ff4ca80..0b87615 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
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,147) size 306x102
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,146) size 306x102
   RenderPartObject {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x96
       RenderView at (0,0) size 300x96
     layer at (0,0) size 300x96
       RenderBlock {HTML} at (0,0) size 300x96
         RenderBody {BODY} at (8,8) size 284x80
-layer at (8,147) size 306x102
+layer at (8,146) size 306x102
   RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)]
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 e106648..101e004 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
     layer at (0,0) size 285x8
       RenderView at (0,0) size 285x0
     layer at (0,0) size 285x8
       RenderBlock {HTML} at (0,0) size 285x8
         RenderBody {BODY} at (8,8) size 269x0
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)]
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 49cddac..71c617f 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF]
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 5ccdff0..f06a8b4 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 96x96
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 96x96
   RenderImage {IMG} at (0,99) size 96x96
-layer at (104,150) size 96x96
+layer at (104,149) size 96x96
   RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF]
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 c3c3791..1440bd0 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)]
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 ff4ca80..0b87615 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
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,147) size 306x102
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,146) size 306x102
   RenderPartObject {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x96
       RenderView at (0,0) size 300x96
     layer at (0,0) size 300x96
       RenderBlock {HTML} at (0,0) size 300x96
         RenderBody {BODY} at (8,8) size 284x80
-layer at (8,147) size 306x102
+layer at (8,146) size 306x102
   RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)]
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 e106648..101e004 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
     layer at (0,0) size 285x8
       RenderView at (0,0) size 285x0
     layer at (0,0) size 285x8
       RenderBlock {HTML} at (0,0) size 285x8
         RenderBody {BODY} at (8,8) size 269x0
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)]
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 76f05ba..3acbe1b 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x77
-  RenderBlock {HTML} at (0,0) size 800x77
-    RenderBody {BODY} at (8,16) size 784x53
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x76
+  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
           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,51) size 784x18
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x18 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x18
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF]
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 49cddac..71c617f 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF]
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 5ccdff0..f06a8b4 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 96x96
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 96x96
   RenderImage {IMG} at (0,99) size 96x96
-layer at (104,150) size 96x96
+layer at (104,149) size 96x96
   RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF]
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 c3c3791..1440bd0 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)]
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 ff4ca80..0b87615 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
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,147) size 306x102
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,146) size 306x102
   RenderPartObject {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x96
       RenderView at (0,0) size 300x96
     layer at (0,0) size 300x96
       RenderBlock {HTML} at (0,0) size 300x96
         RenderBody {BODY} at (8,8) size 284x80
-layer at (8,147) size 306x102
+layer at (8,146) size 306x102
   RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)]
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 e106648..101e004 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
     layer at (0,0) size 285x8
       RenderView at (0,0) size 285x0
     layer at (0,0) size 285x8
       RenderBlock {HTML} at (0,0) size 285x8
         RenderBody {BODY} at (8,8) size 269x0
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)]
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 76f05ba..3acbe1b 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x77
-  RenderBlock {HTML} at (0,0) size 800x77
-    RenderBody {BODY} at (8,16) size 784x53
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x76
+  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
           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,51) size 784x18
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x18 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x18
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF]
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 49cddac..71c617f 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 15x15
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 15x15
   RenderImage {IMG} at (0,99) size 15x15
-layer at (23,150) size 15x15
+layer at (23,149) size 15x15
   RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF]
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 5ccdff0..f06a8b4 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
-  RenderBlock {HTML} at (0,0) size 800x62
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x61
+  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
           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,51) size 784x3
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x3 [border: (3px solid #000000) none]
-layer at (8,150) size 96x96
+layer at (8,50) size 784x3
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
+layer at (8,149) size 96x96
   RenderImage {IMG} at (0,99) size 96x96
-layer at (104,150) size 96x96
+layer at (104,149) size 96x96
   RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF]
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 c3c3791..1440bd0 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x150
       RenderView at (0,0) size 300x150
     layer at (0,0) size 300x150
       RenderBlock {HTML} at (0,0) size 300x150
         RenderBody {BODY} at (8,8) size 284x134
-layer at (8,147) size 306x156
+layer at (8,146) size 306x156
   RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)]
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 ff4ca80..0b87615 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
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,147) size 306x102
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,146) size 306x102
   RenderPartObject {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)]
     layer at (0,0) size 300x96
       RenderView at (0,0) size 300x96
     layer at (0,0) size 300x96
       RenderBlock {HTML} at (0,0) size 300x96
         RenderBody {BODY} at (8,8) size 284x80
-layer at (8,147) size 306x102
+layer at (8,146) size 306x102
   RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)]
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 e106648..101e004 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
     layer at (0,0) size 285x8
       RenderView at (0,0) size 285x0
     layer at (0,0) size 285x8
       RenderBlock {HTML} at (0,0) size 285x8
         RenderBody {BODY} at (8,8) size 269x0
-layer at (8,147) size 306x6
+layer at (8,146) size 306x6
   RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.txt
index d53315d..2d4b851 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x104
-  RenderBlock {HTML} at (0,0) size 800x104
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x103
+  RenderBlock {HTML} at (0,0) size 800x103
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 138x19
           text run at (0,0) width 138: "There must be no red."
-layer at (8,51) size 45x45
-  RenderBlock (relative positioned) {DIV} at (0,35) size 45x45
+layer at (8,50) size 45x45
+  RenderBlock (relative positioned) {DIV} at (0,34) size 45x45
     RenderBlock {DIV} at (0,0) size 45x15 [border: (15px solid #FF0000) none]
     RenderBlock {DIV} at (0,15) size 45x15 [border: (15px solid #FF0000)]
     RenderBlock {DIV} at (15,30) size 15x15 [bgcolor=#FF0000]
-layer at (8,66) size 15x15
+layer at (8,65) size 15x15
   RenderImage {IMG} at (0,15) size 15x15 [bgcolor=#FF0000]
-layer at (23,81) size 15x15
+layer at (23,80) size 15x15
   RenderImage {IMG} at (15,30) size 15x15 [bgcolor=#FF0000]
-layer at (38,51) size 15x15
+layer at (38,50) size 15x15
   RenderImage {IMG} at (30,0) size 15x15 [bgcolor=#FF0000]
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 2483b26..794d399 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+      RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500]
-layer at (11,73) size 15x15
-  RenderImage {IMG} at (11,73) size 15x15
+layer at (11,71) size 15x15
+  RenderImage {IMG} at (11,71) size 15x15
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 110d394..928824e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500]
-layer at (11,73) size 96x96
+layer at (11,71) size 96x96
   RenderImage {IMG} at (3,3) size 96x96
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 2483b26..794d399 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+      RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500]
-layer at (11,73) size 15x15
-  RenderImage {IMG} at (11,73) size 15x15
+layer at (11,71) size 15x15
+  RenderImage {IMG} at (11,71) size 15x15
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 110d394..928824e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500]
-layer at (11,73) size 96x96
+layer at (11,71) size 96x96
   RenderImage {IMG} at (3,3) size 96x96
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 e3c9967..4e4d1a6 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (180,18) size 15x15 [bgcolor=#FFA500]
-layer at (188,73) size 15x15
+layer at (188,71) size 15x15
   RenderImage {IMG} at (180,3) size 15x15
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 bc5b5db..81ea476 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
-layer at (107,73) size 96x96
+layer at (107,71) size 96x96
   RenderImage {IMG} at (99,3) size 96x96
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 36c680a..cb01ae1 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
-layer at (107,73) size 96x96
+layer at (107,71) size 96x96
   RenderImage {IMG} at (99,3) size 96x96
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 bc5b5db..81ea476 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
-layer at (107,73) size 96x96
+layer at (107,71) size 96x96
   RenderImage {IMG} at (99,3) size 96x96
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 36c680a..cb01ae1 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
-layer at (107,73) size 96x96
+layer at (107,71) size 96x96
   RenderImage {IMG} at (99,3) size 96x96
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 bc5b5db..81ea476 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 780x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500]
-layer at (107,73) size 96x96
+layer at (107,71) size 96x96
   RenderImage {IMG} at (99,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 d92cbf7..f7d76ac 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x198
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x198
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 0688be1..46c206e 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 774x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-layer at (8,70) size 198x294
-  RenderBlock (relative positioned) {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+layer at (8,68) size 198x294
+  RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
     RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500]
-layer at (59,73) size 96x96
+layer at (59,71) size 96x96
   RenderImage {IMG} at (51,3) size 96x96
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 c416811..f262f75 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x84
-  RenderBlock {HTML} at (0,0) size 800x84
-    RenderBody {BODY} at (8,16) size 784x60
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x82
+  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
           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,35) size 96x25 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
-        RenderBlock {DIV} at (0,3) size 96x19 [bgcolor=#0000FF]
+      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
             text run at (0,0) width 66: "Filler Text"
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 79f13ed..0c162e1 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x107
-  RenderBlock {HTML} at (0,0) size 785x107
-layer at (8,8) size 769x91 clip at (8,8) size 754x76
-  RenderBody {BODY} at (8,8) size 769x91
-    RenderBlock {P} at (0,16) size 754x19
+layer at (0,0) size 785x105
+  RenderBlock {HTML} at (0,0) size 785x105
+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
         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,51) size 96x25 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
-      RenderBlock {DIV} at (0,3) size 96x19 [bgcolor=#0000FF]
+    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
           text run at (0,0) width 66: "Filler Text"
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 586f0c2..0e77a8d 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
@@ -1,16 +1,16 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,51) size 96x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
+layer at (8,50) size 96x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x192
-layer at (8,51) size 96x192
+layer at (8,50) size 96x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 [bgcolor=#0000FF]
-layer at (104,51) size 96x192
+layer at (104,50) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#FFA500]
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 fe48059..fccca4e 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x274
-  RenderBlock {HTML} at (0,0) size 785x274
-layer at (8,8) size 769x258 clip at (8,8) size 754x243
-  RenderBody {BODY} at (8,8) size 769x258
-    RenderBlock {P} at (0,16) size 754x19
+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
+  RenderBody {BODY} at (8,8) size 769x257
+    RenderBlock {P} at (0,16) size 754x18
       RenderText {#text} at (0,0) size 425x19
         text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,59) size 754x192
-  RenderBlock (relative positioned) {DIV} at (0,51) size 754x192
-layer at (8,59) size 96x192
+layer at (8,58) size 754x192
+  RenderBlock (relative positioned) {DIV} at (0,50) size 754x192
+layer at (8,58) size 96x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x192
-layer at (8,59) size 96x192
+layer at (8,58) size 96x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 [bgcolor=#0000FF]
-layer at (104,59) size 96x192
+layer at (104,58) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#FFA500]
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 76e67fb..9c916eb 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
@@ -1,19 +1,19 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           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,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
-layer at (8,51) size 192x192
+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
         text run at (0,0) width 192: "XX"
         text run at (0,96) width 192: "XX"
     RenderText {#text} at (0,0) size 0x0
-layer at (200,51) size 192x192
+layer at (200,50) size 192x192
   RenderBlock (positioned) {DIV} at (192,0) size 192x192 [bgcolor=#FFA500]
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 57619a2..e54f7cd 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
@@ -1,20 +1,20 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x274
-  RenderBlock {HTML} at (0,0) size 785x274
-layer at (8,8) size 769x258 clip at (8,8) size 754x243 scrollHeight 244
-  RenderBody {BODY} at (8,8) size 769x258
-    RenderBlock {P} at (0,16) size 754x19
+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
+  RenderBody {BODY} at (8,8) size 769x257
+    RenderBlock {P} at (0,16) size 754x18
       RenderText {#text} at (0,0) size 667x19
         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,59) size 754x192
-  RenderBlock (relative positioned) {DIV} at (0,51) size 754x192
-layer at (8,59) size 192x192
+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
         text run at (0,0) width 192: "XX"
         text run at (0,96) width 192: "XX"
     RenderText {#text} at (0,0) size 0x0
-layer at (200,59) size 192x192
+layer at (200,58) size 192x192
   RenderBlock (positioned) {DIV} at (192,0) size 192x192 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.txt
index 9cb39bd..238a17c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x323
-  RenderBlock {HTML} at (0,0) size 800x323
-    RenderBody {BODY} at (8,16) size 784x259
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x322
+  RenderBlock {HTML} at (0,0) size 800x322
+    RenderBody {BODY} at (8,16) size 784x258
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 267x19
           text run at (0,0) width 267: "Test passes if there is a blue square below."
-layer at (8,83) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,67) size 784x192
+layer at (8,82) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,66) size 784x192
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none]
     RenderBlock {DIV} at (0,96) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none]
-layer at (104,83) size 96x192
+layer at (104,82) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.txt
index 60189b9..5d8b30f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x354
-  RenderBlock {HTML} at (0,0) size 785x354
-layer at (8,8) size 769x338 clip at (8,8) size 754x323
-  RenderBody {BODY} at (8,8) size 769x338
-    RenderBlock {P} at (0,16) size 754x19
+layer at (0,0) size 785x353
+  RenderBlock {HTML} at (0,0) size 785x353
+layer at (8,8) size 769x337 clip at (8,8) size 754x322
+  RenderBody {BODY} at (8,8) size 769x337
+    RenderBlock {P} at (0,16) size 754x18
       RenderText {#text} at (0,0) size 267x19
         text run at (0,0) width 267: "Test passes if there is a blue square below."
-layer at (8,91) size 754x192
-  RenderBlock (relative positioned) {DIV} at (0,83) size 754x192
+layer at (8,90) size 754x192
+  RenderBlock (relative positioned) {DIV} at (0,82) size 754x192
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none]
     RenderBlock {DIV} at (0,96) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none]
-layer at (104,91) size 96x192
+layer at (104,90) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.txt
index 053e4c1..0050870 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.txt
@@ -1,15 +1,15 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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 267x19
           text run at (0,0) width 267: "Test passes if there is a blue square below."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
     RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none]
       RenderBlock {DIV} at (0,48) size 96x48 [border: (24px solid #0000FF) none]
       RenderBlock {DIV} at (0,96) size 96x48 [border: (24px solid #0000FF) none]
-layer at (104,51) size 96x192
+layer at (104,50) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.txt
index e2ba22a..951dd21 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x274
-  RenderBlock {HTML} at (0,0) size 785x274
-layer at (8,8) size 769x258 clip at (8,8) size 754x243
-  RenderBody {BODY} at (8,8) size 769x258
-    RenderBlock {P} at (0,16) size 754x19
+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
+  RenderBody {BODY} at (8,8) size 769x257
+    RenderBlock {P} at (0,16) size 754x18
       RenderText {#text} at (0,0) size 267x19
         text run at (0,0) width 267: "Test passes if there is a blue square below."
-layer at (8,59) size 754x192
-  RenderBlock (relative positioned) {DIV} at (0,51) size 754x192
+layer at (8,58) size 754x192
+  RenderBlock (relative positioned) {DIV} at (0,50) size 754x192
     RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none]
       RenderBlock {DIV} at (0,48) size 96x48 [border: (24px solid #0000FF) none]
       RenderBlock {DIV} at (0,96) size 96x48 [border: (24px solid #0000FF) none]
-layer at (104,59) size 96x192
+layer at (104,58) size 96x192
   RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF]
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 e53f7d7..4d8d772 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x147
-  RenderBlock {HTML} at (0,0) size 800x147
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x146
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-      RenderBlock {DIV} at (0,35) size 784x0 [bgcolor=#FF0000]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt
index 2072ae5..cc1ffab 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x178
-  RenderBlock {HTML} at (0,0) size 785x178
-layer at (8,8) size 769x162 clip at (8,8) size 754x147
-  RenderBody {BODY} at (8,8) size 769x162
-    RenderBlock {P} at (0,16) size 754x19
+layer at (0,0) size 785x177
+  RenderBlock {HTML} at (0,0) size 785x177
+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
         text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-    RenderBlock {DIV} at (0,51) size 754x0 [bgcolor=#FF0000]
+    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.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt
index 3d28425..075e00b 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-      RenderBlock {DIV} at (0,35) size 784x0 [bgcolor=#FF0000]
-layer at (8,51) size 96x96
-  RenderBlock (positioned) {DIV} at (8,51) size 96x96
+      RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000]
+layer at (8,50) size 96x96
+  RenderBlock (positioned) {DIV} at (8,50) size 96x96
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 5c372a0..82401d3 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x82
-  RenderBlock {HTML} at (0,0) size 785x82
-layer at (8,8) size 769x66 clip at (8,8) size 754x51
-  RenderBody {BODY} at (8,8) size 769x66
-    RenderBlock {P} at (0,16) size 754x19
+layer at (0,0) size 785x81
+  RenderBlock {HTML} at (0,0) size 785x81
+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
         text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-    RenderBlock {DIV} at (0,51) size 754x0 [bgcolor=#FF0000]
-layer at (8,59) size 96x96
-  RenderBlock (positioned) {DIV} at (8,59) size 96x96
+    RenderBlock {DIV} at (0,50) size 754x0 [bgcolor=#FF0000]
+layer at (8,58) size 96x96
+  RenderBlock (positioned) {DIV} at (8,58) size 96x96
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 fd35a06..0b942c5 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x96
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x96
+layer at (8,50) size 784x96
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
-layer at (8,147) size 96x96
+layer at (8,146) size 96x96
   RenderBlock (relative positioned) {DIV} at (0,0) size 96x96
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 1500d98..8e87d5f 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 785x585
   RenderView at (0,0) size 785x585
-layer at (0,0) size 785x178
-  RenderBlock {HTML} at (0,0) size 785x178
-layer at (8,8) size 769x162 clip at (8,8) size 754x147 scrollHeight 243
-  RenderBody {BODY} at (8,8) size 769x162
-    RenderBlock {P} at (0,16) size 754x19
+layer at (0,0) size 785x177
+  RenderBlock {HTML} at (0,0) size 785x177
+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
         text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,59) size 754x96
-  RenderBlock (relative positioned) {DIV} at (0,51) size 754x96
+layer at (8,58) size 754x96
+  RenderBlock (relative positioned) {DIV} at (0,50) size 754x96
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
-layer at (104,59) size 96x96
+layer at (104,58) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.txt
index 95be13b..3b971e0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
-  RenderBlock {HTML} at (0,0) size 800x93
-    RenderBody {BODY} at (8,16) size 784x69
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x91
+  RenderBlock {HTML} at (0,0) size 800x91
+    RenderBody {BODY} at (8,16) size 784x67
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 422x19
           text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width."
-      RenderBlock (anonymous) at (0,35) size 784x34
+      RenderBlock (anonymous) at (0,34) size 784x33
         RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: (5px solid #FFA500)]
           RenderBlock {DIV} at (15,5) size 120x20 [border: (10px solid #FFA500) none (10px solid #FFA500)]
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.txt
index 7a58832..4a73ecf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x89
-  RenderBlock {HTML} at (0,0) size 800x89
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x88
+  RenderBlock {HTML} at (0,0) size 800x88
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 422x19
           text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width."
-      RenderBlock {DIV} at (0,35) size 100x30
+      RenderBlock {DIV} at (0,34) size 100x30
         RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: (10px solid #FFA500) none (10px solid #FFA500)]
 layer at (8,82) size 150x30
   RenderBlock (positioned) {DIV} at (8,82) size 150x30 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
index 4325da4..bacc1f1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x89
-  RenderBlock {HTML} at (0,0) size 800x89
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x88
+  RenderBlock {HTML} at (0,0) size 800x88
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 422x19
           text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width."
-      RenderBlock {DIV} at (0,35) size 100x30 [bgcolor=#FFA500]
+      RenderBlock {DIV} at (0,34) size 100x30 [bgcolor=#FFA500]
         RenderBlock {DIV} at (10,0) size 140x30 [border: (10px solid #FFA500) none (10px solid #FFA500)]
 layer at (8,82) size 150x30
   RenderBlock (positioned) {DIV} at (8,82) size 150x30 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.txt
index 970b0c2..38df71d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x89
-  RenderBlock {HTML} at (0,0) size 800x89
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x88
+  RenderBlock {HTML} at (0,0) size 800x88
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 422x19
           text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width."
-layer at (8,51) size 784x30
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x30
-layer at (692,51) size 100x30
+layer at (8,50) size 784x30
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x30
+layer at (692,50) size 100x30
   RenderBlock (relative positioned) {DIV} at (684,0) size 100x30 [bgcolor=#FFA500]
-layer at (642,51) size 140x30
+layer at (642,50) size 140x30
   RenderBlock (relative positioned) {DIV} at (-50,0) size 140x30 [border: (10px solid #FFA500) none (10px solid #FFA500)]
-layer at (642,81) size 150x30
+layer at (642,80) size 150x30
   RenderBlock (positioned) {DIV} at (634,30) size 150x30 [bgcolor=#0000FF]
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 333c356..63e414d 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x91
-  RenderBlock {HTML} at (0,0) size 800x91
-    RenderBody {BODY} at (0,16) size 800x75
-      RenderBlock {P} at (0,0) size 800x19
+layer at (0,0) size 800x90
+  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
           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,35) size 800x40 [bgcolor=#FF0000]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt
index a133056..aabc148 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x91
-  RenderBlock {HTML} at (0,0) size 800x91
-    RenderBody {BODY} at (0,16) size 800x75
-      RenderBlock {P} at (0,0) size 800x19
+layer at (0,0) size 800x90
+  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
           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,35) size 800x40 [bgcolor=#FF0000]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt
index 0b92bbf..ae65353 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 694x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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
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 0c260be..6ebc90c 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x80
-  RenderBlock {HTML} at (0,0) size 800x80
-    RenderBody {BODY} at (8,16) size 784x56
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x79
+  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
           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,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt
index 05dc3b1..6f353af 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
-  RenderBlock {HTML} at (0,0) size 800x74
-    RenderBody {BODY} at (8,16) size 784x50
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x73
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x15
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x15
+layer at (8,50) size 784x15
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
     RenderImage {IMG} at (0,0) size 15x15
-layer at (23,51) size 15x15
+layer at (23,50) size 15x15
   RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500]
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 b570971..3af584d 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x96
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x96
+layer at (8,50) size 784x96
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
     RenderImage {IMG} at (0,0) size 96x96
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 f62f704..0044447 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
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
       layer at (0,0) size 300x150
         RenderBlock {HTML} at (0,0) size 300x150
           RenderBody {BODY} at (8,8) size 284x134
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 b4029d1..0064f9f 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
@@ -1,18 +1,18 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
     RenderPartObject {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x96
         RenderView at (0,0) size 300x96
       layer at (0,0) size 300x96
         RenderBlock {HTML} at (0,0) size 300x96
           RenderBody {BODY} at (8,8) size 284x80
-layer at (8,51) size 306x102
+layer at (8,50) size 306x102
   RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)]
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 f62f704..0044447 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
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
       layer at (0,0) size 300x150
         RenderBlock {HTML} at (0,0) size 300x150
           RenderBody {BODY} at (8,8) size 284x134
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 7ae8142..a228e91 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 773x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (91,3) size 15x15
         RenderBlock {DIV} at (3,18) size 192x15 [color=#FFA500]
           RenderText {#text} at (88,0) size 16x15
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 fb1468b..16bc0e0 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x353
-  RenderBlock {HTML} at (0,0) size 800x353
-    RenderBody {BODY} at (8,16) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x352
+  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
           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,35) size 198x294 [border: (3px solid #000000)]
+      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
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 1290975..1da52c7 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
@@ -1,44 +1,44 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x309
-  RenderBlock {HTML} at (0,0) size 800x309
-    RenderBody {BODY} at (8,16) size 784x285
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x308
+  RenderBlock {HTML} at (0,0) size 800x308
+    RenderBody {BODY} at (8,16) size 784x284
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 466x19
           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,35) size 60x60 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 55x55
           RenderTableRow {TR} at (0,0) size 55x55
             RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-      RenderTable {TABLE} at (0,115) size 170x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,114) size 170x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 165x165
           RenderTableRow {TR} at (0,0) size 165x55
-            RenderTableCell {TD} at (0,14) size 55x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (55,14) size 55x26 [border: (3px outset #00FF00) (2px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (110,14) size 55x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,55) size 165x55
-            RenderTableCell {TD} at (0,69) size 55x26 [border: (3px outset #00FF00) (2px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (55,69) size 55x26 [border: (3px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (110,69) size 55x26 [border: (3px outset #00FF00) (3px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,110) size 165x55
-            RenderTableCell {TD} at (0,124) size 55x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (55,124) size 55x26 [border: (3px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (110,124) size 55x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
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 5349109..561e6e5 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
@@ -1,44 +1,44 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x309
-  RenderBlock {HTML} at (0,0) size 800x309
-    RenderBody {BODY} at (8,16) size 784x285
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x308
+  RenderBlock {HTML} at (0,0) size 800x308
+    RenderBody {BODY} at (8,16) size 784x284
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 466x19
           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,35) size 60x60 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 55x55
           RenderTableRow {TR} at (0,0) size 55x55
             RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-      RenderTable {TABLE} at (0,115) size 170x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,114) size 170x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 165x165
           RenderTableRow {TR} at (0,0) size 165x55
-            RenderTableCell {TD} at (0,14) size 55x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (55,14) size 55x26 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (110,14) size 55x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,55) size 165x55
-            RenderTableCell {TD} at (0,69) size 55x26 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (55,69) size 55x26 [border: (3px outset #FF0000)] [r=1 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (110,69) size 55x26 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,110) size 165x55
-            RenderTableCell {TD} at (0,124) size 55x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (55,124) size 55x26 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (110,124) size 55x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            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
                 text run at (4,4) width 32: "ridge"
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 f04e24c..732f66b 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x147
-  RenderBlock {HTML} at (0,0) size 800x147
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x146
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x0
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x0
+layer at (8,50) size 784x0
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
     RenderBlock (floating) {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
       RenderBlock {DIV} at (0,0) size 96x96
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 7d0bed6..fdf8c44 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 438x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt
index 3200e5e..f033f84 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 450x19
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
-      RenderBlock {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt
index c6db9cb..ae7f54c 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 447x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt
index 3200e5e..f033f84 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 450x19
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
-      RenderBlock {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt
index 7d0bed6..fdf8c44 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 438x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt
index 70304b1..a34c253 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x147
-  RenderBlock {HTML} at (0,0) size 800x147
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x146
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-      RenderBlock (floating) {DIV} at (0,35) size 96x96 [color=#008000] [bgcolor=#FF0000]
+      RenderBlock (floating) {DIV} at (0,34) size 96x96 [color=#008000] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 96x97
           text run at (0,0) width 96: "X"
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 32456d5..de38996 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#FF0000]
+          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"
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 b225fa5..202c203 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#FF0000]
+          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"
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 8fa999d..298ea83 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#FF0000]
+          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"
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 8fa999d..298ea83 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#FF0000]
+          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"
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 8fa999d..298ea83 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#FF0000]
+          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"
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 dd068f0..fc0c2f7 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x198
-  RenderBlock {HTML} at (0,0) size 800x198
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x196
+  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
           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,19) width 254: "and protruding out of it toward the right."
-      RenderBlock (floating) {DIV} at (0,54) size 128x128 [bgcolor=#008000]
+          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"
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 cfcaff0..0c0cd39 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x72
-  RenderBlock {HTML} at (0,0) size 800x72
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x71
+  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
           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,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt
index a025342..868d414 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x66
-  RenderBlock {HTML} at (0,0) size 800x66
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x65
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 15x15
-  RenderBlock (floating) {DIV} at (0,35) size 15x15
+layer at (8,50) size 15x15
+  RenderBlock (floating) {DIV} at (0,34) size 15x15
     RenderImage {IMG} at (0,0) size 15x15
-layer at (23,51) size 15x15
+layer at (23,50) size 15x15
   RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500]
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 697d81a..35fa420 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x147
-  RenderBlock {HTML} at (0,0) size 800x147
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x146
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 96x96
-  RenderBlock (floating) {DIV} at (0,35) size 96x96
+layer at (8,50) size 96x96
+  RenderBlock (floating) {DIV} at (0,34) size 96x96
     RenderImage {IMG} at (0,0) size 96x96
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 c348229..2e05046 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
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x207
-  RenderBlock {HTML} at (0,0) size 800x207
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x206
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x0
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x0
+layer at (8,50) size 784x0
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
       layer at (0,0) size 300x150
         RenderBlock {HTML} at (0,0) size 300x150
           RenderBody {BODY} at (8,8) size 284x134
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 b4029d1..0064f9f 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
@@ -1,18 +1,18 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
     RenderPartObject {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x96
         RenderView at (0,0) size 300x96
       layer at (0,0) size 300x96
         RenderBlock {HTML} at (0,0) size 300x96
           RenderBody {BODY} at (8,8) size 284x80
-layer at (8,51) size 306x102
+layer at (8,50) size 306x102
   RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)]
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 c348229..2e05046 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
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x207
-  RenderBlock {HTML} at (0,0) size 800x207
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x206
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x0
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x0
+layer at (8,50) size 784x0
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
       layer at (0,0) size 300x150
         RenderBlock {HTML} at (0,0) size 300x150
           RenderBody {BODY} at (8,8) size 284x134
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 decdc0f..46c176e 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 438x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt
index 6aed821..e57246f 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 450x19
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
-      RenderBlock {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt
index a65ce5c..5e60ba6 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 447x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt
index 6aed821..e57246f 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 450x19
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
-      RenderBlock {DIV} at (0,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt
index decdc0f..46c176e 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
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 438x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt
index 9b6359b..9bd6e06 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+      RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 15x15
         RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt
index 3081fbd..6bedef1 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+      RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 96x96
         RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt
index b03bef7..9c8e5a7 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,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x187
-  RenderBlock {HTML} at (0,0) size 800x187
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
+layer at (0,0) size 800x185
+  RenderBlock {HTML} at (0,0) size 800x185
+    RenderBody {BODY} at (8,16) size 784x36
+      RenderBlock {P} at (0,0) size 784x36
         RenderText {#text} at (0,0) size 106x19
           text run at (0,0) width 106: "There should be "
         RenderInline {STRONG} at (0,0) size 143x19
@@ -17,11 +17,11 @@
         RenderText {#text} at (514,0) size 236x19
           text run at (514,0) width 236: ". The 5 filled green squares should be"
         RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,19) size 57x19
-            text run at (0,19) width 57: "identical"
-        RenderText {#text} at (57,19) size 445x19
-          text run at (57,19) width 445: " to each other. This should still remain true even after a window resize."
-      RenderBlock {DIV} at (0,54) size 784x0
+          RenderText {#text} at (0,18) size 57x19
+            text run at (0,18) width 57: "identical"
+        RenderText {#text} at (57,18) size 445x19
+          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
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 26a2935..832497a7 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,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x163 layerType: background only
-layer at (8,51) size 100x100
-  RenderBlock (positioned) zI: -1 {DIV} at (8,51) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 800x163 layerType: foreground only
-  RenderBlock {HTML} at (0,0) size 800x163
-    RenderBody {BODY} at (8,16) size 784x139
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x161 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
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 295x19
           text run at (0,0) width 295: "Test passes if there is a filled green square and "
         RenderInline {STRONG} at (0,0) size 44x19
@@ -14,6 +14,6 @@
             text run at (295,0) width 44: "no red"
         RenderText {#text} at (339,0) size 4x19
           text run at (339,0) width 4: "."
-      RenderBlock (anonymous) at (0,35) size 784x104
+      RenderBlock (anonymous) at (0,34) size 784x103
         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.txt b/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.txt
index 804cec5..6bce658 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x159 layerType: background only
-layer at (8,51) size 100x100
-  RenderBlock (positioned) zI: -1 {DIV} at (8,51) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 800x159 layerType: foreground only
-  RenderBlock {HTML} at (0,0) size 800x159
-    RenderBody {BODY} at (8,16) size 784x135
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x158 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 800x158 layerType: foreground only
+  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
           text run at (0,0) width 295: "Test passes if there is a filled green square and "
         RenderInline {STRONG} at (0,0) size 44x19
@@ -14,4 +14,4 @@
             text run at (295,0) width 44: "no red"
         RenderText {#text} at (339,0) size 4x19
           text run at (339,0) width 4: "."
-      RenderTable {DIV} at (0,35) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)]
+      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.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt
index 7e48bb8..79664d8 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,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x159
-  RenderBlock {HTML} at (0,0) size 800x159
-    RenderBody {BODY} at (8,16) size 784x135
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x157
+  RenderBlock {HTML} at (0,0) size 800x157
+    RenderBody {BODY} at (8,16) size 784x133
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 425x19
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x100
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x100
+layer at (8,50) size 784x99
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x99
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
       RenderBlock {DIV} at (0,0) size 96x96
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 24cd557..d815396 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x96
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x96
+layer at (8,50) size 784x96
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
       RenderBlock {DIV} at (0,48) size 96x0
       RenderText {#text} at (0,0) size 0x0
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 c5e3f13..f9ff3fe 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-      RenderBlock (anonymous) at (0,35) size 784x96
+      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
             text run at (0,0) width 96: "X"
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 00a3559..db2eb5d 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 680x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      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
             text run at (0,0) width 96: "X"
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 d5eec7e..db8ee55 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x206
-  RenderBlock {HTML} at (0,0) size 800x206
-    RenderBody {BODY} at (8,16) size 784x182
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x204
+  RenderBlock {HTML} at (0,0) size 800x204
+    RenderBody {BODY} at (8,16) size 784x180
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (anonymous) at (0,54) size 784x128
+          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
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 3dbf945..bf1a8c1 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x206
-  RenderBlock {HTML} at (0,0) size 800x206
-    RenderBody {BODY} at (8,16) size 784x182
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 763x38
+layer at (0,0) size 800x204
+  RenderBlock {HTML} at (0,0) size 800x204
+    RenderBody {BODY} at (8,16) size 784x180
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 763x37
           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,19) width 484: "and protruding out of it toward the right. There should be no red in this page."
-      RenderBlock (anonymous) at (0,54) size 784x128
+          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
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 5d0050f..094339f 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x80
-  RenderBlock {HTML} at (0,0) size 800x80
-    RenderBody {BODY} at (8,16) size 784x56
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x79
+  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
           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,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+      RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/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 dfbce1b..ea9034c 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
-  RenderBlock {HTML} at (0,0) size 800x74
-    RenderBody {BODY} at (8,16) size 784x50
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x73
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x15
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x15
+layer at (8,50) size 784x15
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
     RenderImage {IMG} at (0,0) size 15x15
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (23,51) size 15x15
+layer at (23,50) size 15x15
   RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500]
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 b570971..3af584d 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x96
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x96
+layer at (8,50) size 784x96
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
     RenderImage {IMG} at (0,0) size 96x96
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 3dcd7c4..63a46b4 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x134
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 6235f20..bc3c5fd 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
@@ -1,13 +1,13 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
     RenderPartObject {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x96
         RenderView at (0,0) size 300x96
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x80
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x102
+layer at (8,50) size 306x102
   RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)]
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 3dcd7c4..63a46b4 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x134
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 270ed50..a5154bb 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,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x199
-  RenderBlock {HTML} at (0,0) size 800x199
-    RenderBody {BODY} at (8,16) size 784x175
-      RenderBlock {P} at (0,0) size 784x38
+layer at (0,0) size 800x196
+  RenderBlock {HTML} at (0,0) size 800x196
+    RenderBody {BODY} at (8,16) size 784x172
+      RenderBlock {P} at (0,0) size 784x36
         RenderText {#text} at (0,0) size 106x19
           text run at (0,0) width 106: "There should be "
         RenderInline {STRONG} at (0,0) size 143x19
@@ -17,11 +17,11 @@
         RenderText {#text} at (514,0) size 236x19
           text run at (514,0) width 236: ". The 5 filled green squares should be"
         RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,19) size 57x19
-            text run at (0,19) width 57: "identical"
-        RenderText {#text} at (57,19) size 445x19
-          text run at (57,19) width 445: " to each other. This should still remain true even after a window resize."
-      RenderBlock {DIV} at (0,54) size 784x121
+          RenderText {#text} at (0,18) size 57x19
+            text run at (0,18) width 57: "identical"
+        RenderText {#text} at (57,18) size 445x19
+          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: " "
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 ad738a0..bf5d9ff 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x276
-  RenderBlock {HTML} at (0,0) size 800x276
-    RenderBody {BODY} at (8,16) size 784x252
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x274
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x198 [border: (3px solid #000000)]
+          text run at (0,18) width 28: "box."
+      RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
         RenderBlock (anonymous) at (3,3) size 192x15
           RenderImage {IMG} at (0,0) size 15x15
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/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 108bf59..f2a0f80 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          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 192x96
           RenderImage {IMG} at (0,0) size 96x96
           RenderText {#text} at (0,0) size 0x0
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 6e2a268..e6f233f 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x283
-  RenderBlock {HTML} at (0,0) size 800x283
-    RenderBody {BODY} at (8,16) size 784x259
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x282
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,131) size 784x144
-  RenderBlock (relative positioned) {DIV} at (0,115) size 784x144
+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"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,107) size 96x192
+layer at (104,106) size 96x192
   RenderBlock (positioned) {DIV} at (96,-24) size 96x192 [bgcolor=#FFA500]
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 fe96e3c..084a1867 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x283
-  RenderBlock {HTML} at (0,0) size 800x283
-    RenderBody {BODY} at (8,16) size 784x259
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x282
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,131) size 784x144
-  RenderBlock (relative positioned) {DIV} at (0,115) size 784x144
+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"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,107) size 96x192
+layer at (104,106) size 96x192
   RenderBlock (positioned) {DIV} at (96,-24) size 96x192 [bgcolor=#FFA500]
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 b337598..6b28942 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 481x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 96x97
+layer at (8,50) size 96x97
   RenderInline (relative positioned) {SPAN} at (0,0) size 96x97 [color=#0000FF]
     RenderText {#text} at (3,3) size 96x97
       text run at (3,3) width 96: "X"
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 b337598..6b28942 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x257
-  RenderBlock {HTML} at (0,0) size 800x257
-    RenderBody {BODY} at (8,16) size 784x233
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x256
+  RenderBlock {HTML} at (0,0) size 800x256
+    RenderBody {BODY} at (8,16) size 784x232
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 481x19
           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,35) size 198x198 [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 96x97
+layer at (8,50) size 96x97
   RenderInline (relative positioned) {SPAN} at (0,0) size 96x97 [color=#0000FF]
     RenderText {#text} at (3,3) size 96x97
       text run at (3,3) width 96: "X"
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 5d0050f..094339f 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x80
-  RenderBlock {HTML} at (0,0) size 800x80
-    RenderBody {BODY} at (8,16) size 784x56
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x79
+  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
           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,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+      RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt
index dfbce1b..ea9034c 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
-  RenderBlock {HTML} at (0,0) size 800x74
-    RenderBody {BODY} at (8,16) size 784x50
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x73
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x15
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x15
+layer at (8,50) size 784x15
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
     RenderImage {IMG} at (0,0) size 15x15
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (23,51) size 15x15
+layer at (23,50) size 15x15
   RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500]
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 b570971..3af584d 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
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,51) size 784x96
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x96
+layer at (8,50) size 784x96
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
     RenderImage {IMG} at (0,0) size 96x96
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (104,51) size 96x96
+layer at (104,50) size 96x96
   RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500]
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 3dcd7c4..63a46b4 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x134
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 6235f20..bc3c5fd 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
@@ -1,13 +1,13 @@
 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
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x250
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x192
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x192
+layer at (8,50) size 784x192
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
     RenderPartObject {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x96
         RenderView at (0,0) size 300x96
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x80
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x102
+layer at (8,50) size 306x102
   RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)]
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 3dcd7c4..63a46b4 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x191
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  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
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
-layer at (8,51) size 784x156
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x156
+layer at (8,50) size 784x156
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
     RenderPartObject {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)]
       layer at (0,0) size 300x150
         RenderView at (0,0) size 300x150
@@ -16,5 +16,5 @@
           RenderBody {BODY} at (8,8) size 284x134
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 306x156
+layer at (8,50) size 306x156
   RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)]
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 f45d445b4..9884ff4 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,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x199
-  RenderBlock {HTML} at (0,0) size 800x199
-    RenderBody {BODY} at (8,16) size 784x175
-      RenderBlock {P} at (0,0) size 784x38
+layer at (0,0) size 800x196
+  RenderBlock {HTML} at (0,0) size 800x196
+    RenderBody {BODY} at (8,16) size 784x172
+      RenderBlock {P} at (0,0) size 784x36
         RenderText {#text} at (0,0) size 106x19
           text run at (0,0) width 106: "There should be "
         RenderInline {STRONG} at (0,0) size 143x19
@@ -17,11 +17,11 @@
         RenderText {#text} at (514,0) size 236x19
           text run at (514,0) width 236: ". The 5 filled green squares should be"
         RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,19) size 57x19
-            text run at (0,19) width 57: "identical"
-        RenderText {#text} at (57,19) size 445x19
-          text run at (57,19) width 445: " to each other. This should still remain true even after a window resize."
-      RenderBlock {DIV} at (0,54) size 784x121
+          RenderText {#text} at (0,18) size 57x19
+            text run at (0,18) width 57: "identical"
+        RenderText {#text} at (57,18) size 445x19
+          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: " "
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 d771d3e..b00f23a 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
-        RenderBlock (anonymous) at (3,3) size 192x100
+          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
           RenderImage {IMG} at (0,0) size 96x96
           RenderText {#text} at (0,0) size 0x0
-        RenderBlock {DIV} at (3,103) size 96x96 [bgcolor=#FFA500]
+        RenderBlock {DIV} at (3,102) size 96x96 [bgcolor=#FFA500]
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 108bf59..f2a0f80 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x372
-  RenderBlock {HTML} at (0,0) size 800x372
-    RenderBody {BODY} at (8,16) size 784x348
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 771x38
+layer at (0,0) size 800x370
+  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
           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,19) width 28: "box."
-      RenderBlock {DIV} at (0,54) size 198x294 [border: (3px solid #000000)]
+          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 192x96
           RenderImage {IMG} at (0,0) size 96x96
           RenderText {#text} at (0,0) size 0x0
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 6e4646b..f65b99b 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x167
-  RenderBlock {HTML} at (0,0) size 800x167
-    RenderBody {BODY} at (8,16) size 784x135
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x166
+  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
           text run at (0,0) width 193: "There should be no red below."
-      RenderBlock {DIV} at (0,35) size 784x100 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (0,34) size 784x100 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 784x100
           RenderImage {IMG} at (0,0) size 784x100
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 3e83561..b76bea2 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
-  RenderBlock {HTML} at (0,0) size 800x259
-    RenderBody {BODY} at (8,16) size 784x235
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x258
+  RenderBlock {HTML} at (0,0) size 800x258
+    RenderBody {BODY} at (8,16) size 784x234
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "There should be no red below."
-      RenderBlock {DIV} at (0,35) size 600x200 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000]
           RenderImage {IMG} at (0,0) size 100x100
           RenderImage {IMG} at (0,100) size 600x100
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 3e83561..b76bea2 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
-  RenderBlock {HTML} at (0,0) size 800x259
-    RenderBody {BODY} at (8,16) size 784x235
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x258
+  RenderBlock {HTML} at (0,0) size 800x258
+    RenderBody {BODY} at (8,16) size 784x234
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "There should be no red below."
-      RenderBlock {DIV} at (0,35) size 600x200 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000]
           RenderImage {IMG} at (0,0) size 100x100
           RenderImage {IMG} at (0,100) size 600x100
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 4328129..0b03f74 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
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x283
-  RenderBlock {HTML} at (0,0) size 800x283
-    RenderBody {BODY} at (8,16) size 784x251
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x282
+  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
           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,35) size 300x100 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (0,34) size 300x100 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 600x100
           RenderImage {IMG} at (0,0) size 300x100
           RenderText {#text} at (0,0) size 0x0
-layer at (8,167) size 300x100
-  RenderBlock (relative positioned) {DIV} at (0,151) size 300x100
+layer at (8,166) size 300x100
+  RenderBlock (relative positioned) {DIV} at (0,150) size 300x100
     RenderBlock {P} at (0,0) size 600x100
       RenderImage {IMG} at (0,0) size 300x100
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-layer at (8,167) size 300x100
+layer at (8,166) size 300x100
   RenderBlock (positioned) {SPAN} at (0,0) size 300x100 [bgcolor=#008000]
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 b78340b..2610e31 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
@@ -1,25 +1,25 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x475
-  RenderBlock {HTML} at (0,0) size 800x475
-    RenderBody {BODY} at (8,16) size 784x451
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x474
+  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
           text run at (0,0) width 444: "There should be no red below, just two 300x200 pixel lime rectangles."
-layer at (8,51) size 300x200
-  RenderBlock (relative positioned) {DIV} at (0,35) size 300x200 [bgcolor=#FF0000]
+layer at (8,50) size 300x200
+  RenderBlock (relative positioned) {DIV} at (0,34) size 300x200 [bgcolor=#FF0000]
     RenderBlock {DIV} at (0,0) size 300x100 [bgcolor=#00FF00]
       RenderBlock {P} at (0,0) size 375x100
         RenderImage {IMG} at (0,0) size 100x100
         RenderImage {IMG} at (0,100) size 300x100
         RenderText {#text} at (0,0) size 0x0
-layer at (8,267) size 300x200
-  RenderBlock (relative positioned) {DIV} at (0,251) size 300x200 [bgcolor=#FF0000]
+layer at (8,266) size 300x200
+  RenderBlock (relative positioned) {DIV} at (0,250) size 300x200 [bgcolor=#FF0000]
     RenderBlock {DIV} at (0,0) size 300x100 [bgcolor=#00FF00]
       RenderBlock {P} at (0,0) size 375x100
         RenderImage {IMG} at (0,0) size 100x100
         RenderImage {IMG} at (0,100) size 300x100
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (8,367) size 300x100
+layer at (8,366) size 300x100
   RenderBlock (positioned) {SPAN} at (0,100) size 300x100 [bgcolor=#00FF00]
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 19c7785..d8f964f 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableSection {DIV} at (0,0) size 220x220
         RenderTableRow {DIV} at (0,0) size 220x220
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 19c7785..d8f964f 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableSection {DIV} at (0,0) size 220x220
         RenderTableRow {DIV} at (0,0) size 220x220
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 19c7785..d8f964f 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableSection {DIV} at (0,0) size 220x220
         RenderTableRow {DIV} at (0,0) size 220x220
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 e33d365..415beba 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableSection (anonymous) at (0,0) size 220x220
         RenderTableRow {DIV} at (0,0) size 220x220
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 db87a0d..87a4f45 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableCol {DIV} at (0,0) size 0x0
       RenderTableSection (anonymous) at (0,0) size 220x220
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 db87a0d..87a4f45 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableCol {DIV} at (0,0) size 0x0
       RenderTableSection (anonymous) at (0,0) size 220x220
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 e33d365..415beba 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
-layer at (8,51) size 240x240
-  RenderBlock (positioned) {DIV} at (8,51) size 240x240 [border: (10px solid #0000FF)]
+layer at (8,50) size 240x240
+  RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 220x220
       RenderTableSection (anonymous) at (0,0) size 220x220
         RenderTableRow {DIV} at (0,0) size 220x220
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.txt
index 5a3c943..0bb0e4b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x78
-  RenderBlock {HTML} at (0,0) size 800x78
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x76
+  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 437x19
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-      RenderBlock (anonymous) at (0,35) size 784x19
+      RenderBlock (anonymous) at (0,34) size 784x18
         RenderInline {DIV} at (0,0) size 186x19 [border: (5px solid #0000FF) none (5px solid #0000FF)]
           RenderText {#text} at (0,0) size 0x0
           RenderInline {DIV} at (0,0) size 76x19 [border: (5px solid #FFA500) none (5px solid #FFA500)]
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 1c59c0c..575f702 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,51) size 340x340
-  RenderBlock (positioned) {DIV} at (8,51) size 340x340 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x340
+  RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)]
     RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)]
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 53db5a7..425a82e 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
-  RenderBlock {HTML} at (0,0) size 800x70
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 779x38
+layer at (0,0) size 800x68
+  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
           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,19) width 75: "orange box."
-layer at (8,70) size 340x340
-  RenderBlock (positioned) {DIV} at (8,70) size 340x340 [border: (10px solid #0000FF)]
+          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
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 632c289..999fdb0 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,51) size 340x344
-  RenderBlock (positioned) {DIV} at (8,51) size 340x344 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x343
+  RenderBlock (positioned) {DIV} at (8,50) size 340x343 [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.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt
index 4789e58..5b0f4b4 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,51) size 340x340
-  RenderBlock (positioned) {DIV} at (8,51) size 340x340 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x340
+  RenderBlock (positioned) {DIV} at (8,50) size 340x340 [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-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt
index 831b12a..9a288d0 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,51) size 340x344
-  RenderBlock (positioned) {DIV} at (8,51) size 340x344 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x343
+  RenderBlock (positioned) {DIV} at (8,50) size 340x343 [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.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt
index c767cbc..825a49b 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
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,51) size 340x340
-  RenderBlock (positioned) {DIV} at (8,51) size 340x340 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x340
+  RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (10,10) size 320x320
       RenderBlock {DIV} at (50,50) size 220x220 [border: (10px solid #FFA500)]
       RenderTableSection (anonymous) at (0,320) size 320x0
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 1f066d1..26782b6 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
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x181
-  RenderBlock {HTML} at (0,0) size 800x181
-    RenderBody {BODY} at (8,16) size 784x149
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x176
+  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
           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,35) size 752x49 [bgcolor=#008000]
-        RenderBlock (anonymous) at (0,0) size 752x19
+      RenderBlock {DIV} at (16,34) size 752x47 [bgcolor=#008000]
+        RenderBlock (anonymous) at (0,0) size 752x18
           RenderText {#text} at (0,0) size 36x19
             text run at (0,0) width 36: "         "
-        RenderButton {INPUT} at (0,21) size 16x28 [bgcolor=#FFA500] [border: (2px outset #C0C0C0)]
-      RenderBlock {FORM} at (0,100) size 784x49
-        RenderBlock {DIV} at (16,0) size 752x49 [bgcolor=#008000]
-          RenderBlock (anonymous) at (0,0) size 752x19
+        RenderButton {INPUT} at (0,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
               text run at (0,0) width 36: "         "
-          RenderButton {INPUT} at (0,21) size 16x28 [bgcolor=#FFA500] [border: (2px outset #C0C0C0)]
+          RenderButton {INPUT} at (0,20) size 16x27 [bgcolor=#FFA500] [border: (2px outset #C0C0C0)]
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 dd6b0404..37da99c 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 150x249 layerType: background only
-layer at (6,101) size 154x154
-  RenderBlock (positioned) zI: -1 {P} at (6,101) size 154x154 [bgcolor=#FF0000] [border: (2px solid #00FF00)]
-    RenderText zI: -1 {#text} at (2,2) size 97x57
+layer at (8,8) size 150x243 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
       text run at (2,2) width 97: "FAIL (absolute"
-      text run at (2,21) width 94: "positioning not"
-      text run at (2,40) width 67: "supported)"
-layer at (8,8) size 150x249 layerType: foreground only
-  RenderBlock {HTML} at (8,8) size 150x249
-    RenderBody {BODY} at (0,0) size 150x249
-      RenderBlock {P} at (0,0) size 150x95
-        RenderText {#text} at (0,0) size 149x95
+      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
+      RenderBlock {P} at (0,0) size 150x90
+        RenderText {#text} at (0,0) size 149x91
           text run at (0,0) width 113: "There should be a"
-          text run at (0,19) width 149: "green square below this"
-          text run at (0,38) width 117: "line, exactly fitting"
-          text run at (0,57) width 107: "inside a 2px lime"
-          text run at (0,76) width 45: "border."
-      RenderBlock {P} at (0,95) size 150x154
+          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
         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-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt
index 76791ea..10dad0f 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x267
-  RenderBlock {HTML} at (0,0) size 800x267 [color=#000080] [bgcolor=#FFFFFF]
-    RenderBody {BODY} at (8,16) size 784x235
+layer at (0,0) size 800x266
+  RenderBlock {HTML} at (0,0) size 800x266 [color=#000080] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,16) size 784x234
       RenderBlock {DIV} at (0,0) size 100x200
         RenderBlock {P} at (0,0) size 100x200
           RenderEmbeddedObject {OBJECT} at (0,0) size 200x200
@@ -10,6 +10,6 @@
               RenderView at (0,0) size 100x200
             layer at (0,0) size 100x200
               RenderSVGRoot {svg} at (0,0) size 0x0
-      RenderBlock {P} at (0,216) size 784x19
+      RenderBlock {P} at (0,216) size 784x18
         RenderText {#text} at (0,0) size 428x19
           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.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt
index 5682852..19fb750 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,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x163
-  RenderBlock {HTML} at (0,0) size 800x163
-    RenderBody {BODY} at (8,16) size 784x139
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x161
+  RenderBlock {HTML} at (0,0) size 800x161
+    RenderBody {BODY} at (8,16) size 784x137
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 286x19
           text run at (0,0) width 286: "There must be a green box below and no red."
-      RenderBlock {DIV} at (0,35) size 784x104
+      RenderBlock {DIV} at (0,34) size 784x103
         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
           layer at (0,0) size 60x60
             RenderSVGRoot {svg} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (8,51) size 100x100
-  RenderBlock (positioned) {DIV} at (8,51) size 100x100 [border: (20px solid #008000)]
+layer at (8,50) size 100x100
+  RenderBlock (positioned) {DIV} at (8,50) size 100x100 [border: (20px solid #008000)]
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 33474687..bbeecf8 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,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x253
-  RenderBlock {HTML} at (0,0) size 800x253
-    RenderBody {BODY} at (8,16) size 784x229
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x251
+  RenderBlock {HTML} at (0,0) size 800x251
+    RenderBody {BODY} at (8,16) size 784x227
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 286x19
           text run at (0,0) width 286: "There must be a green box below and no red."
-      RenderBlock {DIV} at (0,35) size 784x194
+      RenderBlock {DIV} at (0,34) size 784x193
         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
           layer at (0,0) size 60x150
             RenderSVGRoot {svg} at (0,0) size 0x0
-layer at (8,51) size 100x190
-  RenderBlock (positioned) {DIV} at (8,51) size 100x190 [border: (20px solid #008000)]
+layer at (8,50) size 100x190
+  RenderBlock (positioned) {DIV} at (8,50) size 100x190 [border: (20px solid #008000)]
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 6f6a345..9855fb0 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,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x272
-  RenderBlock {HTML} at (0,0) size 800x272
-    RenderBody {BODY} at (8,8) size 784x256
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x268
+  RenderBlock {HTML} at (0,0) size 800x268
+    RenderBody {BODY} at (8,8) size 784x252
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 298x19
           text run at (0,0) width 298: "All twenty images should be identically square."
-      RenderBlock (anonymous) at (0,19) size 784x237
+      RenderBlock (anonymous) at (0,18) size 784x234
         RenderInline {P} at (0,0) size 75x19
           RenderImage {IMG} at (0,0) size 75x75
         RenderText {#text} at (75,60) size 4x19
@@ -52,55 +52,55 @@
         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,79) size 75x75
-        RenderText {#text} at (75,139) size 4x19
-          text run at (75,139) width 4: " "
+          RenderImage {IMG} at (0,78) size 75x75
+        RenderText {#text} at (75,138) size 4x19
+          text run at (75,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (79,79) size 75x75
-        RenderText {#text} at (154,139) size 4x19
-          text run at (154,139) width 4: " "
+          RenderImage {IMG} at (79,78) size 75x75
+        RenderText {#text} at (154,138) size 4x19
+          text run at (154,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (158,79) size 75x75
-        RenderText {#text} at (233,139) size 4x19
-          text run at (233,139) width 4: " "
+          RenderImage {IMG} at (158,78) size 75x75
+        RenderText {#text} at (233,138) size 4x19
+          text run at (233,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (237,79) size 75x75
-        RenderText {#text} at (312,139) size 4x19
-          text run at (312,139) width 4: " "
+          RenderImage {IMG} at (237,78) size 75x75
+        RenderText {#text} at (312,138) size 4x19
+          text run at (312,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (316,79) size 75x75
-        RenderText {#text} at (391,139) size 4x19
-          text run at (391,139) width 4: " "
+          RenderImage {IMG} at (316,78) size 75x75
+        RenderText {#text} at (391,138) size 4x19
+          text run at (391,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (395,79) size 75x75
-        RenderText {#text} at (470,139) size 4x19
-          text run at (470,139) width 4: " "
+          RenderImage {IMG} at (395,78) size 75x75
+        RenderText {#text} at (470,138) size 4x19
+          text run at (470,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (474,79) size 75x75
-        RenderText {#text} at (549,139) size 4x19
-          text run at (549,139) width 4: " "
+          RenderImage {IMG} at (474,78) size 75x75
+        RenderText {#text} at (549,138) size 4x19
+          text run at (549,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (553,79) size 75x75
-        RenderText {#text} at (628,139) size 4x19
-          text run at (628,139) width 4: " "
+          RenderImage {IMG} at (553,78) size 75x75
+        RenderText {#text} at (628,138) size 4x19
+          text run at (628,138) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (632,79) size 75x75
+          RenderImage {IMG} at (632,78) 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,158) size 75x75
-        RenderText {#text} at (75,218) size 4x19
-          text run at (75,218) width 4: " "
+          RenderImage {IMG} at (0,156) size 75x75
+        RenderText {#text} at (75,216) size 4x19
+          text run at (75,216) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (79,158) size 75x75
+          RenderImage {IMG} at (79,156) 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/width-non-replaced-inline-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.txt
index 379e2ff..c79e941 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x78
-  RenderBlock {HTML} at (0,0) size 800x78
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x76
+  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 505x19
           text run at (0,0) width 505: "Test passes if the left and right borders start and end where the 'Filler Text' does."
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 286x19 [border: (5px solid #000000) none (5px solid #000000)]
           RenderText {#text} at (5,0) size 276x19
             text run at (5,0) width 276: "Filler Text Filler Text Filler Text Filler Text"
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 ef1d180..efa2d28 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
-  RenderBlock {HTML} at (0,0) size 800x74
-    RenderBody {BODY} at (8,16) size 784x50
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x73
+  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
           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,51) size 784x15
-  RenderBlock (relative positioned) {DIV} at (0,35) size 784x15
-layer at (8,51) size 15x15
+layer at (8,50) size 784x15
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
+layer at (8,50) size 15x15
   RenderBlock (relative positioned) {DIV} at (0,0) size 15x15 [bgcolor=#FFA500]
-layer at (32,51) size 96x96
+layer at (32,50) size 96x96
   RenderImage {IMG} at (24,0) size 96x96
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 a5b713a..20c38e3 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
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x57
-  RenderBlock {HTML} at (0,0) size 800x57
-    RenderBody {BODY} at (8,16) size 784x25 [bgcolor=#FFFFFF]
-      RenderBlock {P} at (0,0) size 784x25 [color=#008000] [border: (3px solid #008000)]
+layer at (0,0) size 800x56
+  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
             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.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.txt
index bb065a6..4943e54 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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
           text run at (0,0) width 289: "The following paragraphs should be identical:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 248x19
           text run at (0,0) width 248: "This should be in a normal weight font."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 248x19
           text run at (0,0) width 248: "This should be in a normal weight font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt
index bb065a6..4943e54 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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
           text run at (0,0) width 289: "The following paragraphs should be identical:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 248x19
           text run at (0,0) width 248: "This should be in a normal weight font."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 248x19
           text run at (0,0) width 248: "This should be in a normal weight font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt
index b9a53fc..afefac8 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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
           text run at (0,0) width 289: "The following paragraphs should be identical:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 197x19
           text run at (0,0) width 197: "This should be in a bold font."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 197x19
           text run at (0,0) width 197: "This should be in a bold font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt
index b9a53fc..afefac8 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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
           text run at (0,0) width 289: "The following paragraphs should be identical:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 197x19
           text run at (0,0) width 197: "This should be in a bold font."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 197x19
           text run at (0,0) width 197: "This should be in a bold font."
diff --git a/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.txt
index a7e9ad8..f460b8c 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
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x133
-  RenderBlock {HTML} at (0,0) size 800x133
-    RenderBody {BODY} at (8,16) size 784x101
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x130
+  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
           text run at (0,0) width 296: "The next two paragraphs should look identical:"
-      RenderBlock {P} at (0,35) size 166x25 [border: (3px solid #000000)]
+      RenderBlock {P} at (0,34) size 166x24 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 31x19
           text run at (3,3) width 31: "Test."
-      RenderBlock {P} at (0,76) size 166x25 [border: (3px solid #000000)]
+      RenderBlock {P} at (0,74) size 166x24 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 31x19
           text run at (3,3) width 31: "Test."
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 fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.txt
index eac608a..e598ce2 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.txt
index 8e8e569..b76312a 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
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x152
+  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
           text run at (0,0) width 337: "The following three paragraphs should look identical:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 149x19
           text run at (0,0) width 149: "This is a test paragraph."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderInline (generated) at (0,0) size 32x19
           RenderText at (0,0) size 32x19
             text run at (0,0) width 32: "This "
         RenderText {#text} at (32,0) size 117x19
           text run at (32,0) width 117: "is a test paragraph."
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,102) size 784x18
         RenderInline (generated) at (0,0) size 32x19
           RenderText at (0,0) size 32x19
             text run at (0,0) width 32: "This "
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 fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.txt
index cd39970..273c071 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.txt
index fd723cd..f3bbf9a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.txt
index 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 b22edf3..b70a0a9 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#FF0000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 54e85ad..a28eea7 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 de205cb..d2eaa14 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           text run at (0,0) width 136: "This should be green."
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 fcb2dfa..5ac6b3c 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt
index 24bb5cd..e0e9f86 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
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x226
-  RenderBlock {HTML} at (0,0) size 800x226
-    RenderBody {BODY} at (8,16) size 784x194 [color=#FF0000]
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x220
+  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
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,140) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,136) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,175) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,170) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           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.txt b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt
index 1cb6c48..4976567 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
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  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
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 163x19
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt
index 21c670f..597a4be 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
@@ -1,33 +1,33 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x331
-  RenderBlock {HTML} at (0,0) size 800x331
-    RenderBody {BODY} at (8,16) size 784x299
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x322
+  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
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {DIV} at (0,70) size 784x19 [color=#008000] [bgcolor=#FFFFFF]
-        RenderBlock {P} at (0,0) size 784x19
+      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
             text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,140) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,136) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,175) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,170) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,210) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,204) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,245) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,238) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,280) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,272) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
index 267b600..8fda5b6 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
@@ -1,20 +1,20 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x215
-  RenderBlock {HTML} at (0,0) size 800x215
-    RenderBody {BODY} at (8,16) size 784x183 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x210
+  RenderBlock {HTML} at (0,0) size 800x210
+    RenderBody {BODY} at (8,16) size 784x178 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 348x19
           text run at (0,0) width 348: "The next four blocks should look identical, to the pixel."
-      RenderBlock {P} at (0,35) size 784x25 [border: (3px solid #000080)]
+      RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 27x19
           text run at (3,3) width 27: "Test"
-      RenderBlock {P} at (0,76) size 784x25 [border: (3px solid #000080)]
+      RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 27x19
           text run at (3,3) width 27: "Test"
-      RenderBlock {P} at (0,117) size 784x25 [border: (3px solid #000080)]
+      RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 27x19
           text run at (3,3) width 27: "Test"
-      RenderBlock {P} at (0,158) size 784x25 [border: (3px solid #000080)]
+      RenderBlock {P} at (0,154) size 784x24 [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 27x19
           text run at (3,3) width 27: "Test"
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 0acf767..8eec8d0 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
@@ -1,62 +1,62 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x576
-  RenderBlock {HTML} at (0,0) size 800x576
-    RenderBody {BODY} at (8,16) size 784x544 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x560
+  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
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,102) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {OL} at (0,140) size 784x19
-        RenderListItem {LI} at (40,0) size 744x19
+      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
             text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,175) size 784x19
+      RenderBlock {P} at (0,170) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {UL} at (0,210) size 784x19
-        RenderListItem {LI} at (40,0) size 744x19
+      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
             text run at (0,0) width 163: "This line should be green."
-      RenderBlock {BLOCKQUOTE} at (40,245) size 704x19
-        RenderBlock {P} at (0,0) size 704x19
+      RenderBlock {BLOCKQUOTE} at (40,238) size 704x18
+        RenderBlock {P} at (0,0) size 704x18
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,280) size 784x19
+      RenderBlock {P} at (0,272) size 784x18
         RenderInline {ACRONYM} at (0,0) size 163x19
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {ADDRESS} at (0,315) size 784x19
+      RenderBlock {ADDRESS} at (0,306) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,350) size 784x19
+      RenderBlock {P} at (0,340) size 784x18
         RenderInline {SPAN} at (0,0) size 163x19
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,385) size 784x19
+      RenderBlock {P} at (0,374) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,420) size 784x19
+      RenderBlock {P} at (0,408) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,455) size 784x19
+      RenderBlock {P} at (0,442) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,490) size 784x19
+      RenderBlock {P} at (0,476) size 784x18
         RenderText {#text} at (48,0) size 163x19
           text run at (48,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,525) size 784x19
+      RenderBlock {P} at (0,510) size 784x18
         RenderText {#text} at (0,0) size 163x19
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt
index a4a834f..cf3c26f 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
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x152
+  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
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,102) size 784x18
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
diff --git a/LayoutTests/platform/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 d4d31e1..2cafc7a 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [bgcolor=#00FF00]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.txt
index 4097bb2..31bab81 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
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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
           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.txt b/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
index 5a5348d..649b059 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
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x87
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x118
+  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
           text run at (0,0) width 327: "The two blocks below should have the same height."
-      RenderTable {TABLE} at (80,35) size 102x52
+      RenderTable {TABLE} at (80,34) size 102x52
         RenderTableSection {TBODY} at (0,0) size 102x52
           RenderTableRow {TR} at (0,2) size 102x48
             RenderTableCell {TD} at (2,2) size 48x48 [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.txt
index b385512..1a7f55a 100644
--- a/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x206
+  RenderBlock {HTML} at (0,0) size 800x206
+    RenderBody {BODY} at (8,16) size 784x182
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 321x19
           text run at (0,0) width 321: "There should be two unbroken vertical bars below."
-      RenderBlock {P} at (0,35) size 784x38 [color=#000080]
-        RenderText {#text} at (0,0) size 754x38
+      RenderBlock {P} at (0,34) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 754x37
           text run at (0,0) width 403: "Hold up a credit card to your display. The distance between the "
           text run at (403,0) width 351: "two vertical bars should be exactly the length of a credit"
-          text run at (0,19) width 31: "card "
-          text run at (31,19) width 74: "(85.60mm)."
-      RenderBlock {DIV} at (0,89) size 784x96 [border: (3px solid #000000)]
+          text run at (0,18) width 31: "card "
+          text run at (31,18) width 74: "(85.60mm)."
+      RenderBlock {DIV} at (0,86) size 784x96 [border: (3px solid #000000)]
         RenderBlock {DIV} at (326,0) size 458x16 [border: (3px solid #000000)]
         RenderBlock {DIV} at (326,16) size 458x16 [border: (3px solid #000000)]
         RenderBlock {DIV} at (326,32) size 458x16 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
index fbe9953..8222db9 100644
--- a/LayoutTests/platform/efl/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 324x19
           text run at (0,0) width 324: "There should be a solid vertical bar of green below."
-      RenderBlock {DIV} at (0,35) size 784x60 [color=#008000]
+      RenderBlock {DIV} at (0,34) size 784x60 [color=#008000]
         RenderBlock {DIV} at (0,0) size 784x15
           RenderText {#text} at (0,0) size 60x15
             text run at (0,0) width 60: "   X"
diff --git a/LayoutTests/platform/efl/css2.1/t040303-c62-percent-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t040303-c62-percent-00-b-ag-expected.txt
index 78308b5..e6da3e2 100644
--- a/LayoutTests/platform/efl/css2.1/t040303-c62-percent-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040303-c62-percent-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x335
-  RenderBlock {HTML} at (0,0) size 800x335
-    RenderBody {BODY} at (8,16) size 784x311
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x334
+  RenderBlock {HTML} at (0,0) size 800x334
+    RenderBody {BODY} at (8,16) size 784x310
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be a green box below."
-      RenderBlock {DIV} at (0,35) size 186x276 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 186x276 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (48,18) size 90x75
           RenderBlock {P} at (0,0) size 90x75
             RenderText {#text} at (0,0) size 75x75
diff --git a/LayoutTests/platform/efl/css2.1/t040304-c64-uri-00-a-g-expected.txt b/LayoutTests/platform/efl/css2.1/t040304-c64-uri-00-a-g-expected.txt
index 620bd07..f998511 100644
--- a/LayoutTests/platform/efl/css2.1/t040304-c64-uri-00-a-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040304-c64-uri-00-a-g-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x152
+  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 256x19
           text run at (0,0) width 256: "There should be three green lines below."
-      RenderBlock {P} at (0,35) size 784x19 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,105) size 784x19 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040306-c63-color-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t040306-c63-color-00-b-ag-expected.txt
index bd3a5a9..eadfd27 100644
--- a/LayoutTests/platform/efl/css2.1/t040306-c63-color-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040306-c63-color-00-b-ag-expected.txt
@@ -1,77 +1,77 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x116
-  RenderBlock {HTML} at (0,0) size 800x116
-    RenderBody {BODY} at (8,16) size 784x92 [color=#0000FF]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x112
+  RenderBlock {HTML} at (0,0) size 800x112
+    RenderBody {BODY} at (8,16) size 784x88 [color=#0000FF]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 650x19
           text run at (0,0) width 650: "There should be three solid bars of colour below, each longer than the last, each of the colour specified."
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 38x19
           text run at (0,0) width 38: "Blue: "
         RenderInline {SPAN} at (0,0) size 15x15
-          RenderText {#text} at (38,4) size 15x15
-            text run at (38,4) width 15: "X"
+          RenderText {#text} at (38,3) size 15x15
+            text run at (38,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15
-          RenderText {#text} at (53,4) size 15x15
-            text run at (53,4) width 15: "X"
-        RenderImage {IMG} at (68,4) size 15x15 [color=#FF0000]
+          RenderText {#text} at (53,3) size 15x15
+            text run at (53,3) width 15: "X"
+        RenderImage {IMG} at (68,3) size 15x15 [color=#FF0000]
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 55x19
           text run at (0,0) width 55: "Orange: "
         RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500]
-          RenderText {#text} at (55,4) size 15x15
-            text run at (55,4) width 15: "X"
+          RenderText {#text} at (55,3) size 15x15
+            text run at (55,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500]
-          RenderText {#text} at (70,4) size 15x15
-            text run at (70,4) width 15: "X"
+          RenderText {#text} at (70,3) size 15x15
+            text run at (70,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500]
-          RenderText {#text} at (85,4) size 15x15
-            text run at (85,4) width 15: "X"
+          RenderText {#text} at (85,3) size 15x15
+            text run at (85,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500]
-          RenderText {#text} at (100,4) size 15x15
-            text run at (100,4) width 15: "X"
-        RenderImage {IMG} at (115,4) size 15x15 [color=#FF0000]
+          RenderText {#text} at (100,3) size 15x15
+            text run at (100,3) width 15: "X"
+        RenderImage {IMG} at (115,3) size 15x15 [color=#FF0000]
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,73) size 784x19
+      RenderBlock {DIV} at (0,70) size 784x18
         RenderText {#text} at (0,0) size 41x19
           text run at (0,0) width 41: "Lime: "
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (41,4) size 15x15
-            text run at (41,4) width 15: "X"
+          RenderText {#text} at (41,3) size 15x15
+            text run at (41,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (56,4) size 15x15
-            text run at (56,4) width 15: "X"
+          RenderText {#text} at (56,3) size 15x15
+            text run at (56,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (71,4) size 15x15
-            text run at (71,4) width 15: "X"
+          RenderText {#text} at (71,3) size 15x15
+            text run at (71,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (86,4) size 15x15
-            text run at (86,4) width 15: "X"
+          RenderText {#text} at (86,3) size 15x15
+            text run at (86,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (101,4) size 15x15
-            text run at (101,4) width 15: "X"
+          RenderText {#text} at (101,3) size 15x15
+            text run at (101,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (116,4) size 15x15
-            text run at (116,4) width 15: "X"
+          RenderText {#text} at (116,3) size 15x15
+            text run at (116,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (131,4) size 15x15
-            text run at (131,4) width 15: "X"
+          RenderText {#text} at (131,3) size 15x15
+            text run at (131,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (146,4) size 15x15
-            text run at (146,4) width 15: "X"
+          RenderText {#text} at (146,3) size 15x15
+            text run at (146,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (161,4) size 15x15
-            text run at (161,4) width 15: "X"
+          RenderText {#text} at (161,3) size 15x15
+            text run at (161,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (176,4) size 15x15
-            text run at (176,4) width 15: "X"
+          RenderText {#text} at (176,3) size 15x15
+            text run at (176,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (191,4) size 15x15
-            text run at (191,4) width 15: "X"
+          RenderText {#text} at (191,3) size 15x15
+            text run at (191,3) width 15: "X"
         RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00]
-          RenderText {#text} at (206,4) size 15x15
-            text run at (206,4) width 15: "X"
-        RenderImage {IMG} at (221,4) size 15x15 [color=#FF0000]
+          RenderText {#text} at (206,3) size 15x15
+            text run at (206,3) width 15: "X"
+        RenderImage {IMG} at (221,3) size 15x15 [color=#FF0000]
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t040306-syntax-01-f-expected.txt b/LayoutTests/platform/efl/css2.1/t040306-syntax-01-f-expected.txt
index e89f7dd..5294856 100644
--- a/LayoutTests/platform/efl/css2.1/t040306-syntax-01-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040306-syntax-01-f-expected.txt
@@ -1,32 +1,32 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x331
-  RenderBlock {HTML} at (0,0) size 800x331
-    RenderBody {BODY} at (8,16) size 784x299
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x322
+  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 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,140) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,136) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,175) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,170) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,210) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,204) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,245) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,238) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
-      RenderBlock {P} at (0,280) size 784x19 [color=#007F00]
+      RenderBlock {P} at (0,272) size 784x18 [color=#007F00]
         RenderText {#text} at (0,0) size 132x19
           text run at (0,0) width 132: "This should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t040307-syntax-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040307-syntax-01-b-expected.txt
index 8bb5bf6..01aef2a 100644
--- a/LayoutTests/platform/efl/css2.1/t040307-syntax-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040307-syntax-01-b-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  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 132x19
           text run at (0,0) width 132: "This should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t050201-c12-grouping-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t050201-c12-grouping-00-b-expected.txt
index 9abd229..91c27bd 100644
--- a/LayoutTests/platform/efl/css2.1/t050201-c12-grouping-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t050201-c12-grouping-00-b-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-00-e-expected.txt
index e74c097..8e51e52b 100644
--- a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-00-e-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x105
-  RenderBlock {HTML} at (0,0) size 800x105
-    RenderBody {BODY} at (8,16) size 784x73 [color=#FF0000]
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x102
+  RenderBlock {HTML} at (0,0) size 800x102
+    RenderBody {BODY} at (8,16) size 784x70 [color=#FF0000]
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {UL} at (0,35) size 784x38
-        RenderListItem {LI} at (40,0) size 744x38
-          RenderBlock (anonymous) at (0,0) size 744x19
+      RenderBlock {UL} at (0,34) size 784x36
+        RenderListItem {LI} at (40,0) size 744x36
+          RenderBlock (anonymous) at (0,0) size 744x18
             RenderInline {SPAN} at (0,0) size 163x19 [color=#008000]
               RenderText {#text} at (0,0) size 163x19
                 text run at (0,0) width 163: "This line should be green."
             RenderText {#text} at (0,0) size 0x0
-          RenderBlock {UL} at (0,19) size 744x19
-            RenderListItem {LI} at (40,0) size 704x19 [color=#008000]
+          RenderBlock {UL} at (0,18) size 744x18
+            RenderListItem {LI} at (40,0) size 704x18 [color=#008000]
               RenderText {#text} at (0,0) size 163x19
                 text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-01-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-01-e-expected.txt
index 62add2c..af9b2d3 100644
--- a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-01-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-01-e-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {DIV} at (0,0) size 784x19
-        RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderBlock {P} at (0,0) size 784x18 [color=#008000]
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
-      RenderBlock {UL} at (0,35) size 784x19 [color=#008000]
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,34) size 784x18 [color=#008000]
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderInline {SPAN} at (0,0) size 0x0 [color=#FF0000]
             RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-02-e-expected.txt
index e94f921..134adf8 100644
--- a/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0505-c16-descendant-02-e-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {DIV} at (0,0) size 784x19 [color=#FF0000]
-        RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000]
+        RenderBlock {P} at (0,0) size 784x18 [color=#008000]
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t050803-c14-classes-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t050803-c14-classes-00-e-expected.txt
index c7512e6..86f151d 100644
--- a/LayoutTests/platform/efl/css2.1/t050803-c14-classes-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t050803-c14-classes-00-e-expected.txt
@@ -1,28 +1,28 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x222
-  RenderBlock {HTML} at (0,0) size 800x222
-    RenderBody {BODY} at (8,16) size 784x190 [color=#FF0000]
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x217
+  RenderBlock {HTML} at (0,0) size 800x217
+    RenderBody {BODY} at (8,16) size 784x185 [color=#FF0000]
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {DIV} at (0,35) size 784x19 [color=#008000]
-        RenderBlock {P} at (0,0) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18 [color=#008000]
+        RenderBlock {P} at (0,0) size 784x18
           RenderText {#text} at (0,0) size 194x19
             text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {DIV} at (0,140) size 784x15 [color=#008000]
+      RenderBlock {DIV} at (0,136) size 784x15 [color=#008000]
         RenderBlock {PRE} at (0,0) size 784x15
           RenderText {#text} at (0,0) size 240x15
             text run at (0,0) width 240: "This sentence should be green."
-      RenderBlock {DIV} at (0,171) size 784x19 [color=#008000]
-        RenderBlock {UL} at (0,0) size 784x19
-          RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {DIV} at (0,167) size 784x18 [color=#008000]
+        RenderBlock {UL} at (0,0) size 784x18
+          RenderListItem {LI} at (40,0) size 744x18
             RenderListMarker at (-18,0) size 7x19: bullet
             RenderText {#text} at (0,0) size 194x19
               text run at (0,0) width 194: "This sentence should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0509-c15-ids-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0509-c15-ids-00-a-expected.txt
index 800115a..3c27640 100644
--- a/LayoutTests/platform/efl/css2.1/t0509-c15-ids-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0509-c15-ids-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89 [color=#FF0000]
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x86 [color=#FF0000]
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0509-c15-ids-01-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0509-c15-ids-01-e-expected.txt
index 6a0c512..65b62d8 100644
--- a/LayoutTests/platform/efl/css2.1/t0509-c15-ids-01-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0509-c15-ids-01-e-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x117
-  RenderBlock {HTML} at (0,0) size 800x117
-    RenderBody {BODY} at (8,16) size 784x85 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19 [color=#FF0000]
+layer at (0,0) size 800x115
+  RenderBlock {HTML} at (0,0) size 800x115
+    RenderBody {BODY} at (8,16) size 784x83 [color=#008000]
+      RenderBlock {P} at (0,0) size 784x18 [color=#FF0000]
         RenderInline {SPAN} at (0,0) size 163x19 [color=#008000]
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {PRE} at (0,35) size 784x15
+      RenderBlock {PRE} at (0,34) size 784x15
         RenderText {#text} at (0,0) size 224x15
           text run at (0,0) width 224: " This line should be green. "
-      RenderBlock {UL} at (0,66) size 784x19
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,65) size 784x18
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 163x19
             text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-01-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-01-f-expected.txt
index 91b12b7..c3b0ac7 100644
--- a/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-01-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-01-f-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {DIV} at (0,0) size 784x19 [color=#008000]
-        RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
+        RenderBlock {P} at (0,0) size 784x18
           RenderText {#text} at (0,0) size 159x19
             text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-02-b-expected.txt
index ba9ba3b..d1cdeb5 100644
--- a/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0509-id-sel-syntax-02-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {DIV} at (0,0) size 784x19 [color=#FF0000]
-        RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000]
+        RenderBlock {P} at (0,0) size 784x18 [color=#008000]
           RenderText {#text} at (0,0) size 159x19
             text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt
index b00fe40..79fcd40 100644
--- a/LayoutTests/platform/efl/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x113
-  RenderBlock {HTML} at (0,0) size 800x113
-    RenderBody {BODY} at (8,8) size 784x89
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,8) size 784x86
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 254x19
           text run at (0,0) width 254: "There should be two lines of text below."
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 222x19
           text run at (0,0) width 222: "This line should be white on green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 222x19
           text run at (0,0) width 222: "This line should be white on green."
diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt
index 2e8747f..e9410ed 100644
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 194x19 [color=#008000]
           RenderText {#text} at (0,0) size 194x19
             text run at (0,0) width 194: "This sentence should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-00-e-expected.txt
index aa2336f..0bf7c13 100644
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-00-e-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 164x19 [color=#008000]
           RenderText {#text} at (0,0) size 164x19
             text run at (0,0) width 164: "This link should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-01-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-01-e-expected.txt
index aa2336f..0bf7c13 100644
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-01-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-01-e-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 164x19 [color=#008000]
           RenderText {#text} at (0,0) size 164x19
             text run at (0,0) width 164: "This link should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
index aa2336f..0bf7c13 100644
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 164x19 [color=#008000]
           RenderText {#text} at (0,0) size 164x19
             text run at (0,0) width 164: "This link should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-03-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-03-e-expected.txt
index aa2336f..0bf7c13 100644
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-03-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-03-e-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 164x19 [color=#008000]
           RenderText {#text} at (0,0) size 164x19
             text run at (0,0) width 164: "This link should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt
index 8cf80e9..1ce7fd1 100644
--- a/LayoutTests/platform/efl/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 333x19 [color=#0000FF]
           RenderText {#text} at (0,0) size 333x19
             text run at (0,0) width 333: "While you are activating this link, it should go green."
diff --git a/LayoutTests/platform/efl/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt
index b7cb1c7..324c630 100644
--- a/LayoutTests/platform/efl/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 255x19 [color=#0000FF]
           RenderText {#text} at (0,0) size 255x19
             text run at (0,0) width 255: "If you focus this link, it should go green."
diff --git a/LayoutTests/platform/efl/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt
index d3fe970..b8eb3d4 100644
--- a/LayoutTests/platform/efl/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 360x19 [color=#0000FF]
           RenderText {#text} at (0,0) size 360x19
             text run at (0,0) width 360: "While you are hovering over this link, it should go green."
diff --git a/LayoutTests/platform/efl/css2.1/t051103-dom-hover-01-c-io-expected.txt b/LayoutTests/platform/efl/css2.1/t051103-dom-hover-01-c-io-expected.txt
index bb7d7bb..76bf161 100644
--- a/LayoutTests/platform/efl/css2.1/t051103-dom-hover-01-c-io-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t051103-dom-hover-01-c-io-expected.txt
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x54
-  RenderBlock {HTML} at (0,0) size 800x54
-    RenderBody {BODY} at (8,8) size 784x38
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,8) size 784x36
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 496x19
           text run at (0,0) width 101: "Hover this text, "
           text run at (101,0) width 168: "then wait till it disappears. "
           text run at (269,0) width 227: "At that point there should be no red."
-      RenderBlock {DIV} at (0,19) size 784x19 [color=#FF0000]
+      RenderBlock {DIV} at (0,18) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 164: "This should end up green."
diff --git a/LayoutTests/platform/efl/css2.1/t051103-dom-hover-02-c-io-expected.txt b/LayoutTests/platform/efl/css2.1/t051103-dom-hover-02-c-io-expected.txt
index d23298c..3230e4b 100644
--- a/LayoutTests/platform/efl/css2.1/t051103-dom-hover-02-c-io-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t051103-dom-hover-02-c-io-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x73
-  RenderBlock {HTML} at (0,0) size 800x73
-    RenderBody {BODY} at (8,8) size 784x57
-      RenderBlock {DIV} at (0,0) size 784x38
-        RenderBlock (anonymous) at (0,0) size 784x19
+layer at (0,0) size 800x70
+  RenderBlock {HTML} at (0,0) size 800x70
+    RenderBody {BODY} at (8,8) size 784x54
+      RenderBlock {DIV} at (0,0) size 784x36
+        RenderBlock (anonymous) at (0,0) size 784x18
           RenderText {#text} at (0,0) size 170x19
             text run at (0,0) width 170: "Dummy text. Dummy text."
-        RenderBlock {DIV} at (0,19) size 784x19
+        RenderBlock {DIV} at (0,18) size 784x18
           RenderInline {SPAN} at (0,0) size 496x19
             RenderText {#text} at (0,0) size 496x19
               text run at (0,0) width 101: "Hover this text, "
               text run at (101,0) width 168: "then wait till it disappears. "
               text run at (269,0) width 227: "At that point there should be no red."
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,38) size 784x19 [color=#008000]
+      RenderBlock {DIV} at (0,36) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 170x19
           text run at (0,0) width 170: "Dummy text. Dummy text."
diff --git a/LayoutTests/platform/efl/css2.1/t0602-c13-inh-underlin-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0602-c13-inh-underlin-00-e-expected.txt
index 68f6f22..7ed8f04 100644
--- a/LayoutTests/platform/efl/css2.1/t0602-c13-inh-underlin-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0602-c13-inh-underlin-00-e-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x153
+  RenderBlock {HTML} at (0,0) size 800x153
+    RenderBody {BODY} at (8,16) size 784x121 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 226x19
           text run at (0,0) width 226: "This should be blue and underlined."
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x19
         RenderText {#text} at (0,0) size 293x19
           text run at (0,0) width 293: "This sentence should be underlined, including "
         RenderInline {CODE} at (0,0) size 72x15
@@ -30,7 +30,7 @@
             text run at (520,0) width 57: "this part"
         RenderText {#text} at (577,0) size 4x19
           text run at (577,0) width 4: "."
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,69) size 784x18
         RenderText {#text} at (0,0) size 371x19
           text run at (0,0) width 278: "This sentence should also be underlined, as "
           text run at (278,0) width 93: "well as italics, "
@@ -39,7 +39,7 @@
             text run at (371,0) width 119: "including this part"
         RenderText {#text} at (490,0) size 4x19
           text run at (490,0) width 4: "."
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,103) size 784x18
         RenderText {#text} at (0,0) size 336x19
           text run at (0,0) width 336: "This sentence should be blue but not underlined, like "
         RenderInline {STRONG} at (0,0) size 57x19
diff --git a/LayoutTests/platform/efl/css2.1/t0602-c13-inheritance-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0602-c13-inheritance-00-e-expected.txt
index 49fff66..4899933 100644
--- a/LayoutTests/platform/efl/css2.1/t0602-c13-inheritance-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0602-c13-inheritance-00-e-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x152
+  RenderBlock {HTML} at (0,0) size 800x152
+    RenderBody {BODY} at (8,16) size 784x120 [color=#008000]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 194x19
           text run at (0,0) width 194: "This sentence should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
         RenderText {#text} at (0,0) size 90x19
           text run at (0,0) width 90: "This sentence "
         RenderInline {SPAN} at (0,0) size 61x19
@@ -14,7 +14,7 @@
             text run at (90,0) width 61: "should be"
         RenderText {#text} at (151,0) size 102x19
           text run at (151,0) width 102: " white on green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#FFFFFF]
+      RenderBlock {P} at (0,68) size 784x18 [color=#FFFFFF]
         RenderInline {EM} at (0,0) size 36x19 [color=#008000]
           RenderText {#text} at (0,0) size 36x19
             text run at (0,0) width 36: "PASS"
@@ -24,7 +24,7 @@
           RenderText {#text} at (40,0) size 39x19
             text run at (40,0) width 39: "FAIL"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,102) size 784x18
         RenderText {#text} at (0,0) size 43x19
           text run at (0,0) width 43: "PASS "
         RenderInline {DFN} at (0,0) size 34x19 [color=#FFFFFF]
diff --git a/LayoutTests/platform/efl/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt b/LayoutTests/platform/efl/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt
index a0afc6a..c20a6b8 100644
--- a/LayoutTests/platform/efl/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 239x19
           text run at (0,0) width 239: "This sentence should have no border. "
         RenderInline {SPAN} at (0,0) size 275x29 [border: (5px solid #00FF00)]
           RenderText {#text} at (244,0) size 265x19
             text run at (244,0) width 265: "This sentence should have a green border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 374x35 [bgcolor=#FF0000]
           RenderInline {SPAN} at (0,0) size 374x35 [bgcolor=#00FF00]
             RenderText {#text} at (0,0) size 374x19
diff --git a/LayoutTests/platform/efl/css2.1/t0603-c11-import-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0603-c11-import-00-b-expected.txt
index ea0db6d..668c778 100644
--- a/LayoutTests/platform/efl/css2.1/t0603-c11-import-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0603-c11-import-00-b-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x152
+  RenderBlock {HTML} at (0,0) size 800x152
+    RenderBody {BODY} at (8,16) size 784x120
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,102) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t060401-c32-cascading-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t060401-c32-cascading-00-b-expected.txt
index 8c85d68..f627848 100644
--- a/LayoutTests/platform/efl/css2.1/t060401-c32-cascading-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t060401-c32-cascading-00-b-expected.txt
@@ -1,57 +1,57 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x225
-  RenderBlock {HTML} at (0,0) size 800x225
-    RenderBody {BODY} at (8,8) size 784x209
-      RenderBlock {UL} at (0,0) size 784x152 [color=#FF0000]
-        RenderListItem {LI} at (0,0) size 784x19
+layer at (0,0) size 800x214
+  RenderBlock {HTML} at (0,0) size 800x214
+    RenderBody {BODY} at (8,8) size 784x198
+      RenderBlock {UL} at (0,0) size 784x144 [color=#FF0000]
+        RenderListItem {LI} at (0,0) size 784x18
           RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
             RenderText {#text} at (0,0) size 136x19
               text run at (0,0) width 136: "This should be green."
           RenderText {#text} at (0,0) size 0x0
-        RenderListItem {LI} at (0,19) size 784x76
-          RenderBlock (anonymous) at (0,0) size 784x19
+        RenderListItem {LI} at (0,18) size 784x72
+          RenderBlock (anonymous) at (0,0) size 784x18
             RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
               RenderText {#text} at (0,0) size 136x19
                 text run at (0,0) width 136: "This should be green."
             RenderText {#text} at (0,0) size 0x0
-          RenderBlock {UL} at (0,19) size 784x57
-            RenderListItem {LI} at (0,0) size 784x19
+          RenderBlock {UL} at (0,18) size 784x54
+            RenderListItem {LI} at (0,0) size 784x18
               RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
                 RenderText {#text} at (0,0) size 136x19
                   text run at (0,0) width 136: "This should be green."
               RenderText {#text} at (0,0) size 0x0
-            RenderListItem {LI} at (0,19) size 784x19
+            RenderListItem {LI} at (0,18) size 784x18
               RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
                 RenderText {#text} at (0,0) size 136x19
                   text run at (0,0) width 136: "This should be green."
               RenderText {#text} at (0,0) size 0x0
-            RenderListItem {LI} at (0,38) size 784x19
+            RenderListItem {LI} at (0,36) size 784x18
               RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
                 RenderText {#text} at (0,0) size 136x19
                   text run at (0,0) width 136: "This should be green."
               RenderText {#text} at (0,0) size 0x0
-        RenderListItem {LI} at (0,95) size 784x19
+        RenderListItem {LI} at (0,90) size 784x18
           RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
             RenderText {#text} at (0,0) size 136x19
               text run at (0,0) width 136: "This should be green."
           RenderText {#text} at (0,0) size 0x0
-        RenderListItem {LI} at (0,114) size 784x19
+        RenderListItem {LI} at (0,108) size 784x18
           RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
             RenderText {#text} at (0,0) size 136x19
               text run at (0,0) width 136: "This should be green."
           RenderText {#text} at (0,0) size 0x0
-        RenderListItem {LI} at (0,133) size 784x19
+        RenderListItem {LI} at (0,126) size 784x18
           RenderInline {SPAN} at (0,0) size 136x19 [color=#008000]
             RenderText {#text} at (0,0) size 136x19
               text run at (0,0) width 136: "This should be green."
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,152) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,144) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,171) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,162) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
-      RenderBlock {P} at (0,190) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,180) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 136x19
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t060402-c31-important-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t060402-c31-important-00-b-expected.txt
index b3f82d5..ff8ab76 100644
--- a/LayoutTests/platform/efl/css2.1/t060402-c31-important-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t060402-c31-important-00-b-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt
index 4eff17e..8c1c058 100644
--- a/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 313x19 [color=#008000]
           RenderText {#text} at (0,0) size 313x19
             text run at (0,0) width 313: "Whatever you do to this link, it should stay green."
diff --git a/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt b/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt
index 4eff17e..8c1c058 100644
--- a/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {A} at (0,0) size 313x19 [color=#008000]
           RenderText {#text} at (0,0) size 313x19
             text run at (0,0) width 313: "Whatever you do to this link, it should stay green."
diff --git a/LayoutTests/platform/efl/css2.1/t0801-c412-hz-box-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0801-c412-hz-box-00-b-a-expected.txt
index 72b5ff1..ceebf7a 100644
--- a/LayoutTests/platform/efl/css2.1/t0801-c412-hz-box-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0801-c412-hz-box-00-b-a-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x167
-  RenderBlock {HTML} at (0,0) size 800x167
-    RenderBody {BODY} at (8,16) size 784x135
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x165
+  RenderBlock {HTML} at (0,0) size 800x165
+    RenderBody {BODY} at (8,16) size 784x133
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 283x19
           text run at (0,0) width 283: "The two diagrams below should be identical."
-      RenderBlock {DIV} at (0,35) size 784x100
+      RenderBlock {DIV} at (0,34) size 784x99
         RenderBlock {P} at (40,0) size 520x40 [color=#0000FF] [bgcolor=#00FFFF] [border: none (40px solid #FF00FF) none (40px solid #FF00FF)]
           RenderText {#text} at (80,0) size 360x40
             text run at (80,0) width 360: "X X X X X"
-        RenderBlock {P} at (0,56) size 784x44
+        RenderBlock {P} at (0,56) size 784x43
           RenderImage {OBJECT} at (0,0) size 600x40
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt
index b219e77..6d36acf 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x237
+  RenderBlock {HTML} at (0,0) size 800x237
+    RenderBody {BODY} at (8,16) size 784x213
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 290x19
           text run at (0,0) width 290: "The three diagrams below should be identical:"
-      RenderBlock {P} at (0,35) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
+      RenderBlock {P} at (0,34) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 112x17
           text run at (0,0) width 112: "xxx xxx"
         RenderInline {SPAN} at (0,0) size 112x17 [bgcolor=#00FF00]
@@ -14,7 +14,7 @@
             text run at (0,16) width 112: "xxx xxx"
         RenderText {#text} at (0,32) size 112x17
           text run at (0,32) width 112: "xxx xxx"
-      RenderBlock {P} at (0,99) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
+      RenderBlock {P} at (0,98) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 112x17
           text run at (0,0) width 112: "xxx xxx"
         RenderInline {SPAN} at (0,0) size 112x17 [bgcolor=#00FF00]
@@ -22,7 +22,7 @@
             text run at (0,16) width 112: "xxx xxx"
         RenderText {#text} at (0,32) size 112x17
           text run at (0,32) width 112: "xxx xxx"
-      RenderBlock {DIV} at (0,163) size 784x52
+      RenderBlock {DIV} at (0,162) size 784x51
         RenderImage {IMG} at (0,0) size 48x48
         RenderImage {IMG} at (48,0) size 16x48 [border: (16px solid #FFFF00) none (16px solid #FFFF00) none]
         RenderImage {IMG} at (64,0) size 48x48
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt
index dec1614..b2d9a9e 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x325
-  RenderBlock {HTML} at (0,0) size 800x325
-    RenderBody {BODY} at (8,8) size 784x309
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x324
+  RenderBlock {HTML} at (0,0) size 800x324
+    RenderBody {BODY} at (8,8) size 784x308
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 412x19
           text run at (0,0) width 412: "The two diagrams below should be identical, with no red present."
-      RenderTable {TABLE} at (0,19) size 218x290
+      RenderTable {TABLE} at (0,18) size 218x290
         RenderTableSection {TBODY} at (0,0) size 218x290
           RenderTableRow {TR} at (0,2) size 218x286
             RenderTableCell {TD} at (2,2) size 106x286 [color=#FFA500] [bgcolor=#FFFF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt
index 058d258..2769a16 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x96
-  RenderBlock {HTML} at (0,0) size 800x96
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 273x19
           text run at (0,0) width 273: "There should be a green vertical bar below:"
-      RenderBlock {DIV} at (15,35) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt
index 18b8d01..2ecbf01 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 290x19
           text run at (0,0) width 290: "There should be a green horizontal bar below:"
-      RenderBlock {DIV} at (15,35) size 195x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 30x15
             text run at (0,0) width 30: "x "
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt
index 720d582..321b016 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x126
-  RenderBlock {HTML} at (0,0) size 800x126
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x125
+  RenderBlock {HTML} at (0,0) size 800x125
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 244x19
           text run at (0,0) width 244: "There should be a green square below:"
-      RenderBlock {DIV} at (15,35) size 75x60 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 75x60 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 75x15
             text run at (0,0) width 75: "xx xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt
index 90c05465..3806d10 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x141
-  RenderBlock {HTML} at (0,0) size 800x141
-    RenderBody {BODY} at (8,16) size 784x110
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x109
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 162x19
           text run at (0,0) width 162: "It should say \"HI\" below:"
-      RenderBlock {DIV} at (15,35) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
+      RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 135x15
           text run at (0,0) width 135: "xx xx xx "
         RenderInline {SPAN} at (0,0) size 165x45
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt
index 371d7a8..fed111b 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (15,35) size 120x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 120x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 105x15
             text run at (0,0) width 105: "x x x x"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt
index 6c8def7..c74a5e7 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x114
-  RenderBlock {HTML} at (0,0) size 800x114
-    RenderBody {BODY} at (8,16) size 784x83
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x113
+  RenderBlock {HTML} at (0,0) size 800x113
+    RenderBody {BODY} at (8,16) size 784x82
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 274x19
           text run at (0,0) width 274: "The following two bars should be identical:"
-      RenderBlock {DIV} at (15,35) size 180x15
+      RenderBlock {DIV} at (15,34) size 180x15
         RenderBlock {P} at (0,0) size 180x15 [color=#00FF00] [bgcolor=#FFFF00]
           RenderText {#text} at (0,0) size 45x15
             text run at (0,0) width 45: "xx "
@@ -15,7 +15,7 @@
               text run at (45,0) width 135: "xx xx xx "
           RenderText {#text} at (120,0) size 30x15
             text run at (120,0) width 30: "xx"
-      RenderBlock {DIV} at (15,65) size 754x18
+      RenderBlock {DIV} at (15,64) size 754x18
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt
index a51893f..4293963 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x108
-  RenderBlock {HTML} at (0,0) size 800x108
-    RenderBody {BODY} at (8,16) size 784x84
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x106
+  RenderBlock {HTML} at (0,0) size 800x106
+    RenderBody {BODY} at (8,16) size 784x82
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 274x19
           text run at (0,0) width 274: "The following two bars should be identical:"
-      RenderBlock {DIV} at (30,35) size 75x15
+      RenderBlock {DIV} at (30,34) size 75x15
         RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00]
           RenderInline {SPAN} at (0,0) size 30x15 [color=#FFA500] [bgcolor=#FF0000]
             RenderText {#text} at (0,0) size 30x15
               text run at (0,0) width 30: "xx"
           RenderText {#text} at (-30,0) size 45x15
             text run at (-30,0) width 45: " xx"
-      RenderBlock {DIV} at (0,65) size 784x19
+      RenderBlock {DIV} at (0,64) size 784x18
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt
index 8483717..4a36400 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x151
-  RenderBlock {HTML} at (0,0) size 800x151
-    RenderBody {BODY} at (8,16) size 784x125 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x150
+  RenderBlock {HTML} at (0,0) size 800x150
+    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 291x19
           text run at (0,0) width 291: "The five \"matches\" below should be identical."
-      RenderBlock {DIV} at (0,35) size 200x90 [color=#FFA500]
+      RenderBlock {DIV} at (0,34) size 200x90 [color=#FFA500]
         RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A]
           RenderText {#text} at (142,0) size 10x10
             text run at (142,0) width 10: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt
index 353bef4..0b11f3b 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x183
-  RenderBlock {HTML} at (0,0) size 800x183
-    RenderBody {BODY} at (8,8) size 784x159
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,8) size 784x158
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (3,3) size 128x48 [bgcolor=#FFFF00]
           RenderListItem {LI} at (0,0) size 128x16
             RenderText {#text} at (112,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (0,32) size 128x16
             RenderText {#text} at (112,0) size 16x17
               text run at (112,0) width 16: "-"
-      RenderBlock {DIV} at (16,105) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x16 [border: none (32px solid #FFA500) none (112px solid #FFFF00)]
           RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none]
         RenderBlock {DIV} at (3,19) size 160x16 [border: none (32px solid #FFA500) none (80px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
index aa00c82..276282e 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 802x585
   RenderView at (0,0) size 800x585
-layer at (0,0) size 800x67
-  RenderBlock {HTML} at (0,0) size 800x67
-    RenderBody {BODY} at (8,24) size 784x19
-      RenderBlock {P} at (0,0) size 794x19 [color=#000080]
+layer at (0,0) size 800x66
+  RenderBlock {HTML} at (0,0) size 800x66
+    RenderBody {BODY} at (8,24) size 784x18
+      RenderBlock {P} at (0,0) size 794x18 [color=#000080]
         RenderText {#text} at (0,0) size 286x19
           text run at (0,0) width 286: "This page should have a horizontal scroll bar."
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt
index edac1d5..44184e8 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x113
-  RenderBlock {HTML} at (0,0) size 800x113
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (0,35) size 160x19
-        RenderBlock {P} at (0,0) size 240x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (0,34) size 160x18
+        RenderBlock {P} at (0,0) size 240x18 [color=#FFFF00] [bgcolor=#000080]
           RenderText {#text} at (0,0) size 39x19
             text run at (0,0) width 39: "TEST"
-      RenderBlock {DIV} at (0,70) size 240x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (0,68) size 240x18 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 39x19
           text run at (0,0) width 39: "TEST"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt
index b219e77..6d36acf 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x237
+  RenderBlock {HTML} at (0,0) size 800x237
+    RenderBody {BODY} at (8,16) size 784x213
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 290x19
           text run at (0,0) width 290: "The three diagrams below should be identical:"
-      RenderBlock {P} at (0,35) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
+      RenderBlock {P} at (0,34) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 112x17
           text run at (0,0) width 112: "xxx xxx"
         RenderInline {SPAN} at (0,0) size 112x17 [bgcolor=#00FF00]
@@ -14,7 +14,7 @@
             text run at (0,16) width 112: "xxx xxx"
         RenderText {#text} at (0,32) size 112x17
           text run at (0,32) width 112: "xxx xxx"
-      RenderBlock {P} at (0,99) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
+      RenderBlock {P} at (0,98) size 160x48 [color=#FFA500] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 112x17
           text run at (0,0) width 112: "xxx xxx"
         RenderInline {SPAN} at (0,0) size 112x17 [bgcolor=#00FF00]
@@ -22,7 +22,7 @@
             text run at (0,16) width 112: "xxx xxx"
         RenderText {#text} at (0,32) size 112x17
           text run at (0,32) width 112: "xxx xxx"
-      RenderBlock {DIV} at (0,163) size 784x52
+      RenderBlock {DIV} at (0,162) size 784x51
         RenderImage {IMG} at (0,0) size 48x48
         RenderImage {IMG} at (48,0) size 16x48 [border: (16px solid #FFFF00) none (16px solid #FFFF00) none]
         RenderImage {IMG} at (64,0) size 48x48
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt
index 9f42a35e..d7af3f6 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x345
-  RenderBlock {HTML} at (0,0) size 800x345
-    RenderBody {BODY} at (8,8) size 784x329
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x344
+  RenderBlock {HTML} at (0,0) size 800x344
+    RenderBody {BODY} at (8,8) size 784x328
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 412x19
           text run at (0,0) width 412: "The two diagrams below should be identical, with no red present."
-      RenderTable {TABLE} at (0,19) size 218x310
+      RenderTable {TABLE} at (0,18) size 218x310
         RenderTableSection {TBODY} at (0,0) size 218x310
           RenderTableRow {TR} at (0,2) size 218x306
             RenderTableCell {TD} at (2,2) size 106x306 [color=#FFA500] [bgcolor=#FFFF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt
index 5866026..15a65dd 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x96
-  RenderBlock {HTML} at (0,0) size 800x96
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 273x19
           text run at (0,0) width 273: "There should be a green vertical bar below:"
-      RenderBlock {DIV} at (15,35) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt
index 002b1e5..db0cd66 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 290x19
           text run at (0,0) width 290: "There should be a green horizontal bar below:"
-      RenderBlock {DIV} at (15,35) size 195x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 30x15
             text run at (0,0) width 30: "x "
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt
index bed4714..1c5c52f 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 313x19
           text run at (0,0) width 313: "There should be a small light green square below:"
-      RenderBlock {DIV} at (15,35) size 754x45
+      RenderBlock {DIV} at (15,34) size 754x45
         RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF]
           RenderText {#text} at (0,0) size 30x30
             text run at (0,0) width 30: "xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt
index 4742e9c..be4eac0 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x141
-  RenderBlock {HTML} at (0,0) size 800x141
-    RenderBody {BODY} at (8,16) size 784x110
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x109
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 162x19
           text run at (0,0) width 162: "It should say \"HI\" below:"
-      RenderBlock {DIV} at (15,35) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
+      RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 165x45
           text run at (0,0) width 165: "xx xx xx xx"
           text run at (0,15) width 165: "xx xx xx xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt
index 0909b52..a5e12d4 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (15,35) size 120x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 120x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 105x15
             text run at (0,0) width 105: "x x x x"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
index c3f6107..2238a0d 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x114
-  RenderBlock {HTML} at (0,0) size 800x114
-    RenderBody {BODY} at (8,16) size 784x83
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x113
+  RenderBlock {HTML} at (0,0) size 800x113
+    RenderBody {BODY} at (8,16) size 784x82
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 274x19
           text run at (0,0) width 274: "The following two bars should be identical:"
-      RenderBlock {DIV} at (15,35) size 195x15
+      RenderBlock {DIV} at (15,34) size 195x15
         RenderBlock {P} at (0,0) size 195x15 [color=#00FF00] [bgcolor=#FFFF00]
           RenderText {#text} at (0,0) size 135x15
             text run at (0,0) width 135: "xx xx xx "
@@ -15,7 +15,7 @@
               text run at (75,0) width 90: "xx xx "
           RenderText {#text} at (165,0) size 30x15
             text run at (165,0) width 30: "xx"
-      RenderBlock {DIV} at (15,65) size 754x18
+      RenderBlock {DIV} at (15,64) size 754x18
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt
index 7a52776..2c23cc5 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x108
-  RenderBlock {HTML} at (0,0) size 800x108
-    RenderBody {BODY} at (8,16) size 784x84
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x106
+  RenderBlock {HTML} at (0,0) size 800x106
+    RenderBody {BODY} at (8,16) size 784x82
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 274x19
           text run at (0,0) width 274: "The following two bars should be identical:"
-      RenderBlock {DIV} at (30,35) size 75x15
+      RenderBlock {DIV} at (30,34) size 75x15
         RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00]
           RenderText {#text} at (0,0) size 45x15
             text run at (0,0) width 45: "xx "
           RenderInline {SPAN} at (0,0) size 30x15 [color=#FFA500] [bgcolor=#FF0000]
             RenderText {#text} at (-15,0) size 30x15
               text run at (-15,0) width 30: "xx"
-      RenderBlock {DIV} at (0,65) size 784x19
+      RenderBlock {DIV} at (0,64) size 784x18
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt
index ec49175..0c7789d 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x151
-  RenderBlock {HTML} at (0,0) size 800x151
-    RenderBody {BODY} at (8,16) size 784x125 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x150
+  RenderBlock {HTML} at (0,0) size 800x150
+    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 291x19
           text run at (0,0) width 291: "The five \"matches\" below should be identical."
-      RenderBlock {DIV} at (0,35) size 200x90 [color=#FFA500]
+      RenderBlock {DIV} at (0,34) size 200x90 [color=#FFA500]
         RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A]
           RenderImage {IMG} at (0,0) size 48x10
           RenderText {#text} at (48,0) size 10x10
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt
index 6355a27..302292b 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x183
-  RenderBlock {HTML} at (0,0) size 800x183
-    RenderBody {BODY} at (8,8) size 784x159
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,8) size 784x158
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (35,3) size 128x48 [bgcolor=#FFFF00]
           RenderListItem {LI} at (0,0) size 128x16
             RenderText {#text} at (0,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (0,32) size 128x16
             RenderText {#text} at (0,0) size 16x17
               text run at (0,0) width 16: "-"
-      RenderBlock {DIV} at (16,105) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x16 [border: none (112px solid #FFFF00) none (32px solid #FFA500)]
           RenderBlock {DIV} at (32,0) size 16x16 [border: none none none (16px solid #008080)]
         RenderBlock {DIV} at (3,19) size 160x16 [border: none (80px solid #00FFFF) none (32px solid #FFA500)]
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
index bac3562..ad842ca 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x67
-  RenderBlock {HTML} at (0,0) size 800x67
-    RenderBody {BODY} at (8,24) size 784x19
-      RenderBlock {P} at (-10,0) size 794x19 [color=#000080]
+layer at (0,0) size 800x66
+  RenderBlock {HTML} at (0,0) size 800x66
+    RenderBody {BODY} at (8,24) size 784x18
+      RenderBlock {P} at (-10,0) size 794x18 [color=#000080]
         RenderText {#text} at (0,0) size 294x19
           text run at (0,0) width 294: "  This page should have a horizontal scroll bar."
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt
index f1adcb5..7e31eb8 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (160,35) size 160x19
-        RenderBlock {P} at (-80,0) size 240x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (160,34) size 160x18
+        RenderBlock {P} at (-80,0) size 240x18 [color=#FFFF00] [bgcolor=#000080]
           RenderText {#text} at (0,0) size 39x19
             text run at (0,0) width 39: "TEST"
-      RenderBlock {DIV} at (80,70) size 240x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (80,68) size 240x18 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 39x19
           text run at (0,0) width 39: "TEST"
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt
index b7a80f0..b36279b 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x117
-  RenderBlock {HTML} at (0,0) size 800x117
-    RenderBody {BODY} at (8,16) size 784x85
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x115
+  RenderBlock {HTML} at (0,0) size 800x115
+    RenderBody {BODY} at (8,16) size 784x83
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 252x19
           text run at (0,0) width 252: "The two bars below should be identical:"
-      RenderBlock {DIV} at (15,35) size 105x15 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 105x15 [bgcolor=#FF0000]
         RenderBlock {DIV} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"
@@ -15,7 +15,7 @@
               text run at (30,0) width 45: " x "
           RenderText {#text} at (90,0) size 15x15
             text run at (90,0) width 15: "x"
-      RenderBlock {DIV} at (16,66) size 752x19
+      RenderBlock {DIV} at (16,65) size 752x18
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt
index b1a350f..e7721cf 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 291x19
           text run at (0,0) width 291: "The five \"matches\" below should be identical "
         RenderInline {STRONG} at (0,0) size 129x19
@@ -11,7 +11,7 @@
             text run at (291,0) width 129: "and equally spaced"
         RenderText {#text} at (420,0) size 4x19
           text run at (420,0) width 4: "."
-      RenderBlock {DIV} at (0,35) size 200x180 [color=#FFA500]
+      RenderBlock {DIV} at (0,34) size 200x180 [color=#FFA500]
         RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A]
           RenderImage {IMG} at (0,0) size 24x10
           RenderText {#text} at (24,0) size 10x10
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt
index 669cc04..416d7d9 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x311
-  RenderBlock {HTML} at (0,0) size 800x311
-    RenderBody {BODY} at (8,8) size 784x287
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x310
+  RenderBlock {HTML} at (0,0) size 800x310
+    RenderBody {BODY} at (8,8) size 784x286
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (19,19) size 128x80 [bgcolor=#FFFF00]
           RenderListItem {LI} at (0,0) size 128x16
             RenderText {#text} at (0,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (0,64) size 128x16
             RenderText {#text} at (0,0) size 16x17
               text run at (0,0) width 16: "-"
-      RenderBlock {DIV} at (16,169) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,168) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x112 [bgcolor=#FFFF00] [border: (16px solid #FFA500)]
           RenderBlock {DIV} at (16,16) size 16x16 [bgcolor=#008080]
           RenderBlock {DIV} at (16,32) size 128x48 [bgcolor=#00FFFF] [border: (16px solid #FFFF00)]
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-02-c-expected.txt
index f4cc6db..cb278d1 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-02-c-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 802x585
   RenderView at (0,0) size 800x585
-layer at (0,0) size 800x34
-  RenderBlock {HTML} at (0,0) size 800x34
-    RenderBody {BODY} at (8,-2) size 784x38
-      RenderBlock {P} at (-10,0) size 804x38 [color=#000080]
+layer at (0,0) size 800x32
+  RenderBlock {HTML} at (0,0) size 800x32
+    RenderBody {BODY} at (8,-2) size 784x36
+      RenderBlock {P} at (-10,0) size 804x36 [color=#000080]
         RenderBR {BR} at (0,0) size 0x19
-        RenderText {#text} at (0,19) size 294x19
-          text run at (0,19) width 294: "  This page should have a horizontal scroll bar."
+        RenderText {#text} at (0,18) size 294x19
+          text run at (0,18) width 294: "  This page should have a horizontal scroll bar."
diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt
index 147bcbd..b8db6e3 100644
--- a/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x127
-  RenderBlock {HTML} at (0,0) size 800x127
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x126
+  RenderBlock {HTML} at (0,0) size 800x126
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (16,35) size 134x22 [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 134x22 [border: (3px solid #000000)]
         RenderBlock {P} at (3,3) size 128x16 [color=#FFA500] [bgcolor=#FFFF00]
           RenderText {#text} at (0,0) size 64x17
             text run at (0,0) width 64: "TEST"
-      RenderBlock {DIV} at (16,73) size 134x22 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,72) size 134x22 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 64x16
         RenderImage {IMG} at (67,3) size 64x16
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt
index c242e13..efcde3f 100644
--- a/LayoutTests/platform/efl/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt
@@ -1,113 +1,113 @@
-layer at (0,0) size 785x875
+layer at (0,0) size 785x861
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x875
-  RenderBlock {HTML} at (0,0) size 785x875
-    RenderBody {BODY} at (8,16) size 769x851
-      RenderBlock {P} at (0,0) size 769x19
+layer at (0,0) size 785x861
+  RenderBlock {HTML} at (0,0) size 785x861
+    RenderBody {BODY} at (8,16) size 769x837
+      RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 279x19
           text run at (0,0) width 279: "The two columns below should be identical."
-      RenderTable {TABLE} at (0,35) size 178x816
-        RenderTableSection {TBODY} at (0,0) size 178x816
-          RenderTableRow {TR} at (0,2) size 178x812
-            RenderTableCell {TD} at (2,2) size 86x812 [bgcolor=#008080] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
-              RenderBlock {P} at (3,3) size 80x19 [bgcolor=#FFFF00]
+      RenderTable {TABLE} at (0,34) size 178x803
+        RenderTableSection {TBODY} at (0,0) size 178x803
+          RenderTableRow {TR} at (0,2) size 178x799
+            RenderTableCell {TD} at (2,2) size 86x799 [bgcolor=#008080] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {P} at (3,3) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,97) size 80x19 [bgcolor=#FF00FF]
+              RenderBlock {P} at (3,96) size 80x18 [bgcolor=#FF00FF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,116) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {P} at (3,114) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,210) size 80x19 [bgcolor=#00FF00]
+              RenderBlock {P} at (3,207) size 80x18 [bgcolor=#00FF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,229) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {P} at (3,225) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,286) size 80x19 [bgcolor=#FFFFFF]
+              RenderBlock {P} at (3,281) size 80x18 [bgcolor=#FFFFFF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,342) size 80x93 [bgcolor=#00FFFF]
-                RenderBlock {P} at (0,74) size 80x19 [bgcolor=#FFA500]
+              RenderBlock {DIV} at (3,336) size 80x92 [bgcolor=#00FFFF]
+                RenderBlock {P} at (0,74) size 80x18 [bgcolor=#FFA500]
                   RenderText {#text} at (0,0) size 5x19
                     text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,472) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {P} at (3,465) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,491) size 80x94 [bgcolor=#FF00FF]
+              RenderBlock {P} at (3,483) size 80x93 [bgcolor=#FF00FF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,548) size 80x56 [bgcolor=#00FF00]
+              RenderBlock {P} at (3,539) size 80x55 [bgcolor=#00FF00]
                 RenderText {#text} at (0,37) size 5x19
                   text run at (0,37) width 5: "-"
-              RenderBlock (floating) {P} at (3,678) size 40x19 [bgcolor=#FFFFFF]
+              RenderBlock (floating) {P} at (3,668) size 40x18 [bgcolor=#FFFFFF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,641) size 80x19 [bgcolor=#00FFFF]
+              RenderBlock {P} at (3,631) size 80x18 [bgcolor=#00FFFF]
                 RenderText {#text} at (40,0) size 5x19
                   text run at (40,0) width 5: "-"
-              RenderBlock {P} at (3,697) size 80x56 [bgcolor=#FFA500]
+              RenderBlock {P} at (3,686) size 80x55 [bgcolor=#FFA500]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {P} at (3,753) size 80x56 [bgcolor=#FFFF00]
+              RenderBlock {P} at (3,741) size 80x55 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,37) size 5x19
                   text run at (0,37) width 5: "-"
-            RenderTableCell {TD} at (90,2) size 86x811 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
-              RenderBlock {DIV} at (3,3) size 80x19 [bgcolor=#FFFF00]
+            RenderTableCell {TD} at (90,2) size 86x798 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (3,3) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,22) size 80x75 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,97) size 80x19 [bgcolor=#FF00FF]
+              RenderBlock {DIV} at (3,21) size 80x75 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,96) size 80x18 [bgcolor=#FF00FF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,116) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {DIV} at (3,114) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,135) size 80x75 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,210) size 80x19 [bgcolor=#00FF00]
+              RenderBlock {DIV} at (3,132) size 80x75 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,207) size 80x18 [bgcolor=#00FF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,229) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {DIV} at (3,225) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,248) size 80x37 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,285) size 80x19 [bgcolor=#FFFFFF]
+              RenderBlock {DIV} at (3,243) size 80x37 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,280) size 80x18 [bgcolor=#FFFFFF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,304) size 80x37 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,341) size 80x75 [bgcolor=#00FFFF]
-              RenderBlock {DIV} at (3,416) size 80x19 [bgcolor=#FFA500]
+              RenderBlock {DIV} at (3,298) size 80x37 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,335) size 80x75 [bgcolor=#00FFFF]
+              RenderBlock {DIV} at (3,410) size 80x18 [bgcolor=#FFA500]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,435) size 80x37 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,472) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {DIV} at (3,428) size 80x37 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,465) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,491) size 80x19 [bgcolor=#FF00FF]
+              RenderBlock {DIV} at (3,483) size 80x18 [bgcolor=#FF00FF]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,510) size 80x37 [bgcolor=#FF00FF]
-              RenderBlock {DIV} at (3,547) size 80x37 [bgcolor=#00FF00]
-              RenderBlock {DIV} at (3,584) size 80x19 [bgcolor=#00FF00]
+              RenderBlock {DIV} at (3,501) size 80x37 [bgcolor=#FF00FF]
+              RenderBlock {DIV} at (3,538) size 80x37 [bgcolor=#00FF00]
+              RenderBlock {DIV} at (3,575) size 80x18 [bgcolor=#00FF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,603) size 80x37 [bgcolor=#008080]
-              RenderBlock {DIV} at (3,640) size 80x19 [bgcolor=#00FFFF]
-                RenderBlock {DIV} at (40,0) size 40x19
+              RenderBlock {DIV} at (3,593) size 80x37 [bgcolor=#008080]
+              RenderBlock {DIV} at (3,630) size 80x18 [bgcolor=#00FFFF]
+                RenderBlock {DIV} at (40,0) size 40x18
                   RenderText {#text} at (0,0) size 5x19
                     text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,696) size 80x19 [bgcolor=#FFA500]
+              RenderBlock {DIV} at (3,685) size 80x18 [bgcolor=#FFA500]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-              RenderBlock {DIV} at (3,715) size 80x37 [bgcolor=#FFA500]
-              RenderBlock {DIV} at (3,752) size 80x37 [bgcolor=#FFFF00]
-              RenderBlock {DIV} at (3,789) size 80x19 [bgcolor=#FFFF00]
+              RenderBlock {DIV} at (3,703) size 80x37 [bgcolor=#FFA500]
+              RenderBlock {DIV} at (3,740) size 80x37 [bgcolor=#FFFF00]
+              RenderBlock {DIV} at (3,777) size 80x18 [bgcolor=#FFFF00]
                 RenderText {#text} at (0,0) size 5x19
                   text run at (0,0) width 5: "-"
-layer at (101,712) size 80x37
-  RenderBlock (relative positioned) {DIV} at (3,659) size 80x37 [bgcolor=#008080]
-layer at (101,730) size 40x19
-  RenderBlock (positioned) {DIV} at (0,18) size 40x19 [bgcolor=#FFFFFF]
+layer at (101,700) size 80x37
+  RenderBlock (relative positioned) {DIV} at (3,648) size 80x37 [bgcolor=#008080]
+layer at (101,719) size 40x18
+  RenderBlock (positioned) {DIV} at (0,19) size 40x18 [bgcolor=#FFFFFF]
     RenderText {#text} at (0,0) size 5x19
       text run at (0,0) width 5: "-"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt
index b690998..08dbd96 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,35) size 120x60 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 100x20
           text run at (0,0) width 100: "xx xx"
         RenderInline {SPAN} at (0,0) size 40x20 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt
index bafc4fa..345ab5e 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,35) size 120x60 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 100x20
           text run at (0,0) width 100: "xx xx"
         RenderInline {SPAN} at (0,0) size 40x20 [color=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt
index 08ff71c..c14488a 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x87
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,67) size 120x20 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,66) size 120x20 [color=#FFFFFF]
         RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000]
           RenderText {#text} at (0,0) size 40x20
             text run at (0,0) width 40: "xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt
index ae9c238..c21b87a 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x165
-  RenderBlock {HTML} at (0,0) size 800x165
-    RenderBody {BODY} at (8,8) size 784x149
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x164
+  RenderBlock {HTML} at (0,0) size 800x164
+    RenderBody {BODY} at (8,8) size 784x148
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 267x19
           text run at (0,0) width 267: "The next two columns should be identical."
-      RenderTable {TABLE} at (0,19) size 138x130
+      RenderTable {TABLE} at (0,18) size 138x130
         RenderTableSection {TBODY} at (0,0) size 138x130
           RenderTableRow {TR} at (0,2) size 138x126
             RenderTableCell {TD} at (2,2) size 66x126 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt
index fab158d..45f764f 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x96
-  RenderBlock {HTML} at (0,0) size 800x96
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 273x19
           text run at (0,0) width 273: "There should be a green vertical bar below:"
-      RenderBlock {DIV} at (15,35) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt
index 4ed593e..c912ebc 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (15,35) size 195x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 30x15
             text run at (0,0) width 30: "x "
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt
index 8ed959e66..ef4788d 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x126
-  RenderBlock {HTML} at (0,0) size 800x126
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x125
+  RenderBlock {HTML} at (0,0) size 800x125
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 244x19
           text run at (0,0) width 244: "There should be a green square below:"
-      RenderBlock {DIV} at (15,35) size 754x60
+      RenderBlock {DIV} at (15,34) size 754x60
         RenderBlock {DIV} at (0,0) size 75x60 [bgcolor=#FF0000]
           RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF]
             RenderText {#text} at (0,0) size 75x15
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt
index 90c05465..3806d10 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x141
-  RenderBlock {HTML} at (0,0) size 800x141
-    RenderBody {BODY} at (8,16) size 784x110
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x109
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 162x19
           text run at (0,0) width 162: "It should say \"HI\" below:"
-      RenderBlock {DIV} at (15,35) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
+      RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 135x15
           text run at (0,0) width 135: "xx xx xx "
         RenderInline {SPAN} at (0,0) size 165x45
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt
index a657697..c3e6287 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x117
-  RenderBlock {HTML} at (0,0) size 800x117
-    RenderBody {BODY} at (8,16) size 784x85
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x115
+  RenderBlock {HTML} at (0,0) size 800x115
+    RenderBody {BODY} at (8,16) size 784x83
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 289x19
           text run at (0,0) width 289: "The following two blocks should be identical:"
-      RenderBlock {DIV} at (15,35) size 135x15 [color=#FFFF00] [bgcolor=#FFA500]
+      RenderBlock {DIV} at (15,34) size 135x15 [color=#FFFF00] [bgcolor=#FFA500]
         RenderText {#text} at (0,0) size 15x15
           text run at (0,0) width 15: "x"
         RenderInline {SPAN} at (0,0) size 60x15
@@ -14,7 +14,7 @@
             text run at (15,0) width 15: "x"
         RenderText {#text} at (75,0) size 15x15
           text run at (75,0) width 15: "x"
-      RenderBlock {P} at (0,66) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,65) size 784x18 [color=#000080]
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt
index 6fa0eac..083d9c7 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x151
-  RenderBlock {HTML} at (0,0) size 800x151
-    RenderBody {BODY} at (8,16) size 784x125 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x150
+  RenderBlock {HTML} at (0,0) size 800x150
+    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 252x19
           text run at (0,0) width 252: "The five bars below should be identical."
-      RenderBlock {DIV} at (0,35) size 106x90 [color=#0000FF]
+      RenderBlock {DIV} at (0,34) size 106x90 [color=#0000FF]
         RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080]
           RenderText {#text} at (48,0) size 10x10
             text run at (48,0) width 10: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
index cc79563..baf9508 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x183
-  RenderBlock {HTML} at (0,0) size 800x183
-    RenderBody {BODY} at (8,8) size 784x159
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,8) size 784x158
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00]
           RenderListItem {LI} at (0,0) size 128x16
             RenderText {#text} at (112,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (0,32) size 128x16
             RenderText {#text} at (112,0) size 16x17
               text run at (112,0) width 16: "-"
-      RenderBlock {DIV} at (16,105) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x16 [border: none (32px solid #FFFF00) none (112px solid #FFFF00)]
           RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none]
         RenderBlock {DIV} at (3,19) size 160x16 [border: none (32px solid #FFFF00) none (80px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-02-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-02-f-expected.txt
index 58eec698..142dce3 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-02-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-02-f-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x89
-  RenderBlock {HTML} at (0,0) size 800x89
-    RenderBody {BODY} at (8,16) size 784x57
-      RenderBlock {P} at (0,0) size 176x57 [bgcolor=#FFFFFF] [border: (16px solid #008000) none]
-        RenderText {#text} at (0,0) size 152x57
+layer at (0,0) size 800x86
+  RenderBlock {HTML} at (0,0) size 800x86
+    RenderBody {BODY} at (8,16) size 784x54
+      RenderBlock {P} at (0,0) size 176x54 [bgcolor=#FFFFFF] [border: (16px solid #008000) none]
+        RenderText {#text} at (0,0) size 152x55
           text run at (0,0) width 152: "There should be a green"
-          text run at (0,19) width 150: "block to the right of this"
-          text run at (0,38) width 27: "text."
+          text run at (0,18) width 150: "block to the right of this"
+          text run at (0,36) width 27: "text."
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-03-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-03-f-expected.txt
index 5184fe0..7b24409 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-03-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-03-f-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (16,35) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (16,34) size 192x18 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 39x19
           text run at (0,0) width 39: "TEST"
-      RenderBlock {DIV} at (16,70) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (16,68) size 192x18 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 39x19
           text run at (0,0) width 39: "TEST"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt
index faa169c..3c923e0 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,35) size 120x60 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 100x20
           text run at (0,0) width 100: "xx xx"
         RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt
index 22c92d0..6c08716 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,35) size 120x60 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 100x20
           text run at (0,0) width 100: "xx xx"
         RenderInline {SPAN} at (0,0) size 40x20 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
index 08ff71c..c14488a 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x87
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (0,67) size 120x20 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,66) size 120x20 [color=#FFFFFF]
         RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000]
           RenderText {#text} at (0,0) size 40x20
             text run at (0,0) width 40: "xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt
index 672d198..d4aecc1 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x165
-  RenderBlock {HTML} at (0,0) size 800x165
-    RenderBody {BODY} at (8,8) size 784x149
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x164
+  RenderBlock {HTML} at (0,0) size 800x164
+    RenderBody {BODY} at (8,8) size 784x148
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 267x19
           text run at (0,0) width 267: "The next two columns should be identical."
-      RenderTable {TABLE} at (0,19) size 138x130
+      RenderTable {TABLE} at (0,18) size 138x130
         RenderTableSection {TBODY} at (0,0) size 138x130
           RenderTableRow {TR} at (0,2) size 138x126
             RenderTableCell {TD} at (2,2) size 66x126 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt
index 8a40104..154e829 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x96
-  RenderBlock {HTML} at (0,0) size 800x96
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x64
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 273x19
           text run at (0,0) width 273: "There should be a green vertical bar below:"
-      RenderBlock {DIV} at (15,35) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt
index 403e95f..38a81eb 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 223x19
           text run at (0,0) width 223: "There should be a green bar below:"
-      RenderBlock {DIV} at (15,35) size 195x45 [bgcolor=#008000]
+      RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000]
         RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 30x15
             text run at (0,0) width 30: "x "
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt
index 4bc97a0..e57c25344 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x111
-  RenderBlock {HTML} at (0,0) size 800x111
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x110
+  RenderBlock {HTML} at (0,0) size 800x110
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 313x19
           text run at (0,0) width 313: "There should be a small light green square below:"
-      RenderBlock {DIV} at (15,35) size 754x45
+      RenderBlock {DIV} at (15,34) size 754x45
         RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF]
           RenderText {#text} at (0,0) size 30x30
             text run at (0,0) width 30: "xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt
index 4742e9c..be4eac0 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x141
-  RenderBlock {HTML} at (0,0) size 800x141
-    RenderBody {BODY} at (8,16) size 784x110
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x109
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 162x19
           text run at (0,0) width 162: "It should say \"HI\" below:"
-      RenderBlock {DIV} at (15,35) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
+      RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080]
         RenderText {#text} at (0,0) size 165x45
           text run at (0,0) width 165: "xx xx xx xx"
           text run at (0,15) width 165: "xx xx xx xx"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt
index f9ec6043..339f16e 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x117
-  RenderBlock {HTML} at (0,0) size 800x117
-    RenderBody {BODY} at (8,16) size 784x85
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x115
+  RenderBlock {HTML} at (0,0) size 800x115
+    RenderBody {BODY} at (8,16) size 784x83
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 289x19
           text run at (0,0) width 289: "The following two blocks should be identical:"
-      RenderBlock {DIV} at (15,35) size 135x15 [color=#FFFF00] [bgcolor=#FFA500]
+      RenderBlock {DIV} at (15,34) size 135x15 [color=#FFFF00] [bgcolor=#FFA500]
         RenderText {#text} at (0,0) size 15x15
           text run at (0,0) width 15: "x"
         RenderInline {SPAN} at (0,0) size 60x15
@@ -14,7 +14,7 @@
             text run at (60,0) width 15: "x"
         RenderText {#text} at (75,0) size 15x15
           text run at (75,0) width 15: "x"
-      RenderBlock {P} at (0,66) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,65) size 784x18 [color=#000080]
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt
index 6fa0eac..083d9c7 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x151
-  RenderBlock {HTML} at (0,0) size 800x151
-    RenderBody {BODY} at (8,16) size 784x125 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x150
+  RenderBlock {HTML} at (0,0) size 800x150
+    RenderBody {BODY} at (8,16) size 784x124 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 252x19
           text run at (0,0) width 252: "The five bars below should be identical."
-      RenderBlock {DIV} at (0,35) size 106x90 [color=#0000FF]
+      RenderBlock {DIV} at (0,34) size 106x90 [color=#0000FF]
         RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080]
           RenderText {#text} at (48,0) size 10x10
             text run at (48,0) width 10: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt
index 6543f7e..7106e15 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x183
-  RenderBlock {HTML} at (0,0) size 800x183
-    RenderBody {BODY} at (8,8) size 784x159
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,8) size 784x158
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00]
           RenderListItem {LI} at (32,0) size 128x16
             RenderText {#text} at (0,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (32,32) size 128x16
             RenderText {#text} at (0,0) size 16x17
               text run at (0,0) width 16: "-"
-      RenderBlock {DIV} at (16,105) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x16 [border: none (112px solid #FFFF00) none (32px solid #FFFF00)]
           RenderBlock {DIV} at (32,0) size 16x16 [border: none none none (16px solid #008080)]
         RenderBlock {DIV} at (3,19) size 160x16 [border: none (80px solid #00FFFF) none (32px solid #FFFF00)]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-02-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-02-f-expected.txt
index 86d8594..14e043f 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-02-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-02-f-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x89
-  RenderBlock {HTML} at (0,0) size 800x89
-    RenderBody {BODY} at (8,16) size 784x57
-      RenderBlock {P} at (0,0) size 176x57 [bgcolor=#FFFFFF] [border: (16px solid #008000)]
-        RenderText {#text} at (16,0) size 152x57
+layer at (0,0) size 800x86
+  RenderBlock {HTML} at (0,0) size 800x86
+    RenderBody {BODY} at (8,16) size 784x54
+      RenderBlock {P} at (0,0) size 176x54 [bgcolor=#FFFFFF] [border: (16px solid #008000)]
+        RenderText {#text} at (16,0) size 152x55
           text run at (16,0) width 152: "There should be a green"
-          text run at (16,19) width 141: "block to the left of this"
-          text run at (16,38) width 27: "text."
+          text run at (16,18) width 141: "block to the left of this"
+          text run at (16,36) width 27: "text."
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
index 7ec768c..c1613b3 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (16,35) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (16,34) size 192x18 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (32,0) size 39x19
           text run at (32,0) width 39: "TEST"
-      RenderBlock {DIV} at (16,70) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (16,68) size 192x18 [color=#FFFF00] [bgcolor=#000080]
         RenderImage {IMG} at (0,14) size 32x1
         RenderText {#text} at (32,0) size 39x19
           text run at (32,0) width 39: "TEST"
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt
index 5b57841..5026953 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x193
-  RenderBlock {HTML} at (0,0) size 800x193
-    RenderBody {BODY} at (8,16) size 784x145
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x191
+  RenderBlock {HTML} at (0,0) size 800x191
+    RenderBody {BODY} at (8,16) size 784x143
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 268x19
           text run at (0,0) width 268: "The two sweets below should be identical:"
-      RenderBlock {DIV} at (0,49) size 105x15 [bgcolor=#FF0000]
+      RenderBlock {DIV} at (0,48) size 105x15 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 30x15
             text run at (0,0) width 30: "x "
@@ -15,5 +15,5 @@
               text run at (45,0) width 15: "x"
           RenderText {#text} at (75,0) size 30x15
             text run at (75,0) width 30: " x"
-      RenderBlock {DIV} at (0,96) size 784x49
+      RenderBlock {DIV} at (0,95) size 784x48
         RenderImage {IMG} at (0,0) size 105x45
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-00-b-ag-expected.txt
index 438344f..f383ed9 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x389
-  RenderBlock {HTML} at (0,0) size 800x389
-    RenderBody {BODY} at (8,16) size 784x363 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x388
+  RenderBlock {HTML} at (0,0) size 800x388
+    RenderBody {BODY} at (8,16) size 784x362 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 283x19
           text run at (0,0) width 283: "The five diagrams below should be identical."
-      RenderBlock {DIV} at (0,35) size 138x328 [color=#FFA500]
+      RenderBlock {DIV} at (0,34) size 138x328 [color=#FFA500]
         RenderBlock {P} at (0,0) size 138x58 [bgcolor=#FF0000] [border: (24px solid #FFFF00)]
           RenderImage {IMG} at (24,24) size 10x10
           RenderImage {IMG} at (34,24) size 10x10
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-01-e-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-01-e-a-expected.txt
index b7b787b..93edd00 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-01-e-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-01-e-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x311
-  RenderBlock {HTML} at (0,0) size 800x311
-    RenderBody {BODY} at (8,8) size 784x287
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x310
+  RenderBlock {HTML} at (0,0) size 800x310
+    RenderBody {BODY} at (8,8) size 784x286
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 318x19
           text run at (0,0) width 318: "The following two diagrams should look identical."
-      RenderBlock {DIV} at (16,35) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,34) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
         RenderBlock {UL} at (3,3) size 160x112 [bgcolor=#FFFF00]
           RenderListItem {LI} at (16,16) size 128x16
             RenderText {#text} at (0,0) size 16x17
@@ -17,7 +17,7 @@
           RenderListItem {LI} at (16,80) size 128x16
             RenderText {#text} at (0,0) size 16x17
               text run at (0,0) width 16: "-"
-      RenderBlock {DIV} at (16,169) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (16,168) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 160x112 [bgcolor=#FFFF00] [border: (16px solid #FFFF00)]
           RenderBlock {DIV} at (16,16) size 16x16 [bgcolor=#008080]
           RenderBlock {DIV} at (16,32) size 128x48 [bgcolor=#00FFFF] [border: (16px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-02-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-02-f-expected.txt
index 59cbab4..0108d30 100644
--- a/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-02-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5510-padn-02-f-expected.txt
@@ -1,14 +1,14 @@
 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
-    RenderBody {BODY} at (8,16) size 784x153
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,16) size 784x150
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 240x19
           text run at (0,0) width 240: "The next two bars should be identical:"
-      RenderBlock {DIV} at (16,35) size 192x51 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (16,34) size 192x50 [color=#FFFF00] [bgcolor=#000080]
         RenderText {#text} at (16,16) size 39x19
           text run at (16,16) width 39: "TEST"
-      RenderBlock {DIV} at (16,102) size 192x51 [color=#FFFF00] [bgcolor=#000080] [border: (16px solid #000080)]
+      RenderBlock {DIV} at (16,100) size 192x50 [color=#FFFF00] [bgcolor=#000080] [border: (16px solid #000080)]
         RenderText {#text} at (16,16) size 39x19
           text run at (16,16) width 39: "TEST"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt
index 756deaf..a271e39 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x124
-  RenderBlock {HTML} at (0,0) size 800x124
-    RenderBody {BODY} at (8,16) size 784x100
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x122
+  RenderBlock {HTML} at (0,0) size 800x122
+    RenderBody {BODY} at (8,16) size 784x98
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "The three boxes below should have progressively thinner top borders."
-      RenderTable {TABLE} at (0,35) size 66x65 [color=#000080]
-        RenderTableSection {TBODY} at (0,0) size 66x65
-          RenderTableRow {TR} at (0,2) size 66x61
-            RenderTableCell {TD} at (2,2) size 20x61 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 18x27 [border: (5px solid #000080) (3px solid #000080)]
+      RenderTable {TABLE} at (0,34) size 66x64 [color=#000080]
+        RenderTableSection {TBODY} at (0,0) size 66x64
+          RenderTableRow {TR} at (0,2) size 66x60
+            RenderTableCell {TD} at (2,2) size 20x60 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 18x26 [border: (5px solid #000080) (3px solid #000080)]
                 RenderText {#text} at (3,5) size 12x19
                   text run at (3,5) width 12: "A"
-            RenderTableCell {TD} at (24,4) size 19x59 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 17x25 [border: (3px solid #000080)]
+            RenderTableCell {TD} at (24,4) size 19x58 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 17x24 [border: (3px solid #000080)]
                 RenderText {#text} at (3,3) size 11x19
                   text run at (3,3) width 11: "B"
-            RenderTableCell {TD} at (45,6) size 19x57 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 17x23 [border: (1px solid #000080) (3px solid #000080)]
+            RenderTableCell {TD} at (45,6) size 19x56 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 17x22 [border: (1px solid #000080) (3px solid #000080)]
                 RenderText {#text} at (3,1) size 11x19
                   text run at (3,1) width 11: "C"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt
index 2427557..468dcc6 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x53
-  RenderBlock {HTML} at (0,0) size 800x53
-    RenderBody {BODY} at (8,8) size 784x37
-      RenderBlock {DIV} at (0,0) size 784x37
-        RenderBlock {DIV} at (0,0) size 784x37 [color=#008000] [border: (15px solid #008000) (3px solid #008000)]
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,8) size 784x36
+      RenderBlock {DIV} at (0,0) size 784x36
+        RenderBlock {DIV} at (0,0) size 784x36 [color=#008000] [border: (15px solid #008000) (3px solid #008000)]
           RenderText {#text} at (3,15) size 230x19
             text run at (3,15) width 230: "There should be no red on this page."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
index b7e5197..b5d7b33 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 230x19
           text run at (0,0) width 230: "There should be no red on this page:"
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt
index 4d1b599..8b4ff5e 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x38
-  RenderBlock {HTML} at (0,0) size 800x38
-    RenderBody {BODY} at (8,8) size 784x22
-      RenderBlock {DIV} at (0,0) size 784x22 [color=#000080]
-        RenderBlock {DIV} at (0,0) size 784x22 [border: none (3px solid #000080)]
+layer at (0,0) size 800x37
+  RenderBlock {HTML} at (0,0) size 800x37
+    RenderBody {BODY} at (8,8) size 784x21
+      RenderBlock {DIV} at (0,0) size 784x21 [color=#000080]
+        RenderBlock {DIV} at (0,0) size 784x21 [border: none (3px solid #000080)]
           RenderText {#text} at (3,0) size 264x19
             text run at (3,0) width 264: "This box should be open ended at the top."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
index 2fd50c7..dca7629 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {SPAN} at (0,0) size 254x23 [border: (1px solid #000000) (3px solid #000000)]
           RenderText {#text} at (3,0) size 248x19
             text run at (3,0) width 248: "This box should have a thin top border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be no red on this line. "
         RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt
index e102a0e..02a5e4c 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x174
-  RenderBlock {HTML} at (0,0) size 800x174
-    RenderBody {BODY} at (8,16) size 784x142
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x170
+  RenderBlock {HTML} at (0,0) size 800x170
+    RenderBody {BODY} at (8,16) size 784x138
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 448x19
           text run at (0,0) width 448: "The three boxes below should have progressively thinner right borders."
-      RenderBlock {P} at (0,35) size 784x25 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)]
+      RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)]
         RenderText {#text} at (3,3) size 12x19
           text run at (3,3) width 12: "A"
-      RenderBlock {P} at (0,76) size 784x25 [border: (3px solid #000000)]
+      RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 11x19
           text run at (3,3) width 11: "B"
-      RenderBlock {P} at (0,117) size 784x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)]
+      RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)]
         RenderText {#text} at (3,3) size 11x19
           text run at (3,3) width 11: "C"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt
index 7574fc8..380da30 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x41
-  RenderBlock {HTML} at (0,0) size 800x41
-    RenderBody {BODY} at (8,8) size 784x25
-      RenderBlock {DIV} at (0,0) size 784x25
-        RenderBlock {DIV} at (0,0) size 784x25 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)]
+layer at (0,0) size 800x40
+  RenderBlock {HTML} at (0,0) size 800x40
+    RenderBody {BODY} at (8,8) size 784x24
+      RenderBlock {DIV} at (0,0) size 784x24
+        RenderBlock {DIV} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)]
           RenderText {#text} at (3,3) size 230x19
             text run at (3,3) width 230: "There should be no red on this page."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
index b7e5197..b5d7b33 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 230x19
           text run at (0,0) width 230: "There should be no red on this page:"
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt
index b07e561..e5f964a 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x41
-  RenderBlock {HTML} at (0,0) size 800x41
-    RenderBody {BODY} at (8,8) size 784x25
-      RenderBlock {DIV} at (0,0) size 784x25 [color=#000080]
-        RenderBlock {DIV} at (0,0) size 784x25 [border: (3px solid #000080) none (3px solid #000080)]
+layer at (0,0) size 800x40
+  RenderBlock {HTML} at (0,0) size 800x40
+    RenderBody {BODY} at (8,8) size 784x24
+      RenderBlock {DIV} at (0,0) size 784x24 [color=#000080]
+        RenderBlock {DIV} at (0,0) size 784x24 [border: (3px solid #000080) none (3px solid #000080)]
           RenderText {#text} at (3,3) size 273x19
             text run at (3,3) width 273: "This box should be open ended at the right."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
index fbf68be..c87c4bb 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {SPAN} at (0,0) size 261x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)]
           RenderText {#text} at (3,0) size 257x19
             text run at (3,0) width 257: "This box should have a thin right border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be no red on this line. "
         RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt
index 5f532b4..62bdc4f 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x124
-  RenderBlock {HTML} at (0,0) size 800x124
-    RenderBody {BODY} at (8,16) size 784x100
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x122
+  RenderBlock {HTML} at (0,0) size 800x122
+    RenderBody {BODY} at (8,16) size 784x98
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 463x19
           text run at (0,0) width 463: "The three boxes below should have progressively thinner bottom borders."
-      RenderTable {TABLE} at (0,35) size 66x65 [color=#000080]
-        RenderTableSection {TBODY} at (0,0) size 66x65
-          RenderTableRow {TR} at (0,2) size 66x61
-            RenderTableCell {TD} at (2,2) size 20x61 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 18x27 [border: (3px solid #000080) (5px solid #000080) (3px solid #000080)]
+      RenderTable {TABLE} at (0,34) size 66x64 [color=#000080]
+        RenderTableSection {TBODY} at (0,0) size 66x64
+          RenderTableRow {TR} at (0,2) size 66x60
+            RenderTableCell {TD} at (2,2) size 20x60 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 18x26 [border: (3px solid #000080) (5px solid #000080) (3px solid #000080)]
                 RenderText {#text} at (3,3) size 12x19
                   text run at (3,3) width 12: "A"
-            RenderTableCell {TD} at (24,2) size 19x59 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 17x25 [border: (3px solid #000080)]
+            RenderTableCell {TD} at (24,2) size 19x58 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 17x24 [border: (3px solid #000080)]
                 RenderText {#text} at (3,3) size 11x19
                   text run at (3,3) width 11: "B"
-            RenderTableCell {TD} at (45,2) size 19x57 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {P} at (1,17) size 17x23 [border: (3px solid #000080) (1px solid #000080) (3px solid #000080)]
+            RenderTableCell {TD} at (45,2) size 19x56 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {P} at (1,17) size 17x22 [border: (3px solid #000080) (1px solid #000080) (3px solid #000080)]
                 RenderText {#text} at (3,3) size 11x19
                   text run at (3,3) width 11: "C"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt
index f257132..70ca4b0 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x53
-  RenderBlock {HTML} at (0,0) size 800x53
-    RenderBody {BODY} at (8,8) size 784x37
-      RenderBlock {DIV} at (0,0) size 784x37
-        RenderBlock {DIV} at (0,0) size 784x37 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)]
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,8) size 784x36
+      RenderBlock {DIV} at (0,0) size 784x36
+        RenderBlock {DIV} at (0,0) size 784x36 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)]
           RenderText {#text} at (3,3) size 230x19
             text run at (3,3) width 230: "There should be no red on this page."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
index b7e5197..b5d7b33 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 230x19
           text run at (0,0) width 230: "There should be no red on this page:"
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt
index f16a46f..a1ebabf5 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x38
-  RenderBlock {HTML} at (0,0) size 800x38
-    RenderBody {BODY} at (8,8) size 784x22
-      RenderBlock {DIV} at (0,0) size 784x22 [color=#000080]
-        RenderBlock {DIV} at (0,0) size 784x22 [border: (3px solid #000080) none (3px solid #000080)]
+layer at (0,0) size 800x37
+  RenderBlock {HTML} at (0,0) size 800x37
+    RenderBody {BODY} at (8,8) size 784x21
+      RenderBlock {DIV} at (0,0) size 784x21 [color=#000080]
+        RenderBlock {DIV} at (0,0) size 784x21 [border: (3px solid #000080) none (3px solid #000080)]
           RenderText {#text} at (3,3) size 288x19
             text run at (3,3) width 288: "This box should be open ended at the bottom."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
index e055c71..c5e0616 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {SPAN} at (0,0) size 278x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)]
           RenderText {#text} at (3,0) size 272x19
             text run at (3,0) width 272: "This box should have a thin bottom border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be no red on this line. "
         RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt
index 1586881..cfd382c 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x174
-  RenderBlock {HTML} at (0,0) size 800x174
-    RenderBody {BODY} at (8,16) size 784x142
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x170
+  RenderBlock {HTML} at (0,0) size 800x170
+    RenderBody {BODY} at (8,16) size 784x138
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "The three boxes below should have progressively thinner left borders."
-      RenderBlock {P} at (0,35) size 784x25 [border: (3px solid #000000) (5px solid #000000)]
+      RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000000) (5px solid #000000)]
         RenderText {#text} at (5,3) size 12x19
           text run at (5,3) width 12: "A"
-      RenderBlock {P} at (0,76) size 784x25 [border: (3px solid #000000)]
+      RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 11x19
           text run at (3,3) width 11: "B"
-      RenderBlock {P} at (0,117) size 784x25 [border: (3px solid #000000) (1px solid #000000)]
+      RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000000) (1px solid #000000)]
         RenderText {#text} at (1,3) size 11x19
           text run at (1,3) width 11: "C"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt
index 1bc0654..98abe1d 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x41
-  RenderBlock {HTML} at (0,0) size 800x41
-    RenderBody {BODY} at (8,8) size 784x25
-      RenderBlock {DIV} at (0,0) size 784x25
-        RenderBlock {DIV} at (0,0) size 784x25 [color=#008000] [border: (3px solid #008000) (15px solid #008000)]
+layer at (0,0) size 800x40
+  RenderBlock {HTML} at (0,0) size 800x40
+    RenderBody {BODY} at (8,8) size 784x24
+      RenderBlock {DIV} at (0,0) size 784x24
+        RenderBlock {DIV} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000) (15px solid #008000)]
           RenderText {#text} at (15,3) size 230x19
             text run at (15,3) width 230: "There should be no red on this page."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
index b7e5197..b5d7b33 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 230x19
           text run at (0,0) width 230: "There should be no red on this page:"
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt
index d26effee..0988b49 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x41
-  RenderBlock {HTML} at (0,0) size 800x41
-    RenderBody {BODY} at (8,8) size 784x25
-      RenderBlock {DIV} at (0,0) size 784x25 [color=#000080]
-        RenderBlock {DIV} at (0,0) size 784x25 [border: (3px solid #000080) none]
+layer at (0,0) size 800x40
+  RenderBlock {HTML} at (0,0) size 800x40
+    RenderBody {BODY} at (8,8) size 784x24
+      RenderBlock {DIV} at (0,0) size 784x24 [color=#000080]
+        RenderBlock {DIV} at (0,0) size 784x24 [border: (3px solid #000080) none]
           RenderText {#text} at (0,3) size 264x19
             text run at (0,3) width 264: "This box should be open ended at the left."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
index 4a3731f..ecdea25 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {SPAN} at (0,0) size 252x25 [border: (3px solid #000000) (1px solid #000000)]
           RenderText {#text} at (1,0) size 248x19
             text run at (1,0) width 248: "This box should have a thin left border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be no red on this line. "
         RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-00-a-expected.txt
index 34b4530..3fafd0e 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-00-a-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x174
-  RenderBlock {HTML} at (0,0) size 800x174
-    RenderBody {BODY} at (8,16) size 784x142
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x170
+  RenderBlock {HTML} at (0,0) size 800x170
+    RenderBody {BODY} at (8,16) size 784x138
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 415x19
           text run at (0,0) width 415: "The three boxes below should have progressively thinner borders."
-      RenderBlock {P} at (0,35) size 784x29 [border: (5px solid #000000)]
+      RenderBlock {P} at (0,34) size 784x28 [border: (5px solid #000000)]
         RenderText {#text} at (5,5) size 12x19
           text run at (5,5) width 12: "A"
-      RenderBlock {P} at (0,80) size 784x25 [border: (3px solid #000000)]
+      RenderBlock {P} at (0,78) size 784x24 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 11x19
           text run at (3,3) width 11: "B"
-      RenderBlock {P} at (0,121) size 784x21 [border: (1px solid #000000)]
+      RenderBlock {P} at (0,118) size 784x20 [border: (1px solid #000000)]
         RenderText {#text} at (1,1) size 11x19
           text run at (1,1) width 11: "C"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt
index eca81c7..f478282 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x65
-  RenderBlock {HTML} at (0,0) size 800x65
-    RenderBody {BODY} at (8,8) size 784x49
-      RenderBlock {DIV} at (0,0) size 784x49
-        RenderBlock {DIV} at (0,0) size 784x49 [color=#008000] [border: (15px solid #008000)]
-          RenderBlock {P} at (15,15) size 754x19 [color=#000000] [bgcolor=#FFFFFF]
+layer at (0,0) size 800x64
+  RenderBlock {HTML} at (0,0) size 800x64
+    RenderBody {BODY} at (8,8) size 784x48
+      RenderBlock {DIV} at (0,0) size 784x48
+        RenderBlock {DIV} at (0,0) size 784x48 [color=#008000] [border: (15px solid #008000)]
+          RenderBlock {P} at (15,15) size 754x18 [color=#000000] [bgcolor=#FFFFFF]
             RenderText {#text} at (0,0) size 230x19
               text run at (0,0) width 230: "There should be no red on this page."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
index 63f4a43..9b697a9 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  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 230x19
           text run at (0,0) width 230: "There should be no red on this page:"
-      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
-      RenderBlock {P} at (0,70) size 784x19 [color=#FF0000]
+      RenderBlock {P} at (0,68) size 784x18 [color=#FF0000]
         RenderText {#text} at (0,0) size 4x19
           text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5515-ibrdr-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
index ab7447c..1447437 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderInline {SPAN} at (0,0) size 226x21 [border: (1px solid #000000)]
           RenderText {#text} at (1,0) size 224x19
             text run at (1,0) width 224: "This box should have a thin border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be no red on this line. "
         RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5516-brdr-c-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5516-brdr-c-00-a-expected.txt
index c1d1fd2..76b0823 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5516-brdr-c-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5516-brdr-c-00-a-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x197
-  RenderBlock {HTML} at (0,0) size 800x197
-    RenderBody {BODY} at (8,16) size 784x165
-      RenderBlock {P} at (0,0) size 784x25 [border: (3px solid #008000)]
+layer at (0,0) size 800x194
+  RenderBlock {HTML} at (0,0) size 800x194
+    RenderBody {BODY} at (8,16) size 784x162
+      RenderBlock {P} at (0,0) size 784x24 [border: (3px solid #008000)]
         RenderText {#text} at (3,3) size 235x19
           text run at (3,3) width 235: "This box should have a green border."
-      RenderBlock {P} at (0,41) size 784x25 [border: (3px solid #008000)]
+      RenderBlock {P} at (0,40) size 784x24 [border: (3px solid #008000)]
         RenderText {#text} at (3,3) size 300x19
           text run at (3,3) width 300: "This box should have an identical green border."
-      RenderBlock {P} at (0,82) size 784x83 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)]
+      RenderBlock {P} at (0,80) size 784x82 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)]
         RenderText {#text} at (32,32) size 532x19
           text run at (32,32) width 532: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt
index f611140..c5bd636d 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x249
-  RenderBlock {HTML} at (0,0) size 800x249
-    RenderBody {BODY} at (8,48) size 784x153
-      RenderBlock {P} at (48,0) size 688x19
+layer at (0,0) size 800x246
+  RenderBlock {HTML} at (0,0) size 800x246
+    RenderBody {BODY} at (8,48) size 784x150
+      RenderBlock {P} at (48,0) size 688x18
         RenderInline {SPAN} at (0,0) size 241x25 [border: (3px solid #008000)]
           RenderText {#text} at (3,0) size 235x19
             text run at (3,0) width 235: "This box should have a green border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (48,67) size 688x19
+      RenderBlock {P} at (48,66) size 688x18
         RenderInline {SPAN} at (0,0) size 241x25 [border: (3px solid #008000)]
           RenderText {#text} at (3,0) size 235x19
             text run at (3,0) width 235: "This box should have a green border."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (48,134) size 688x19
+      RenderBlock {P} at (48,132) size 688x18
         RenderInline {SPAN} at (0,0) size 596x83 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)]
           RenderText {#text} at (32,0) size 532x19
             text run at (32,0) width 532: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5517-brdr-s-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5517-brdr-s-00-c-expected.txt
index ebb3470..178204d 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5517-brdr-s-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5517-brdr-s-00-c-expected.txt
@@ -1,41 +1,41 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x536
-  RenderBlock {HTML} at (0,0) size 800x536
-    RenderBody {BODY} at (8,16) size 784x504
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x524
+  RenderBlock {HTML} at (0,0) size 800x524
+    RenderBody {BODY} at (8,16) size 784x492
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 269x19
           text run at (0,0) width 269: "The borders below should be as described:"
-      RenderBlock {P} at (0,35) size 784x29 [border: (5px dotted #000080)]
+      RenderBlock {P} at (0,34) size 784x28 [border: (5px dotted #000080)]
         RenderText {#text} at (5,5) size 104x19
           text run at (5,5) width 104: "Blue and dotted."
-      RenderBlock {P} at (0,80) size 784x29 [border: (5px dashed #000080)]
+      RenderBlock {P} at (0,78) size 784x28 [border: (5px dashed #000080)]
         RenderText {#text} at (5,5) size 109x19
           text run at (5,5) width 109: "Blue and dashed."
-      RenderBlock {P} at (0,125) size 784x29 [border: (5px solid #000080)]
+      RenderBlock {P} at (0,122) size 784x28 [border: (5px solid #000080)]
         RenderText {#text} at (5,5) size 95x19
           text run at (5,5) width 95: "Blue and solid."
-      RenderBlock {P} at (0,170) size 784x29 [border: (5px double #000080)]
+      RenderBlock {P} at (0,166) size 784x28 [border: (5px double #000080)]
         RenderText {#text} at (5,5) size 108x19
           text run at (5,5) width 108: "Blue and double."
-      RenderBlock {P} at (0,215) size 784x29 [border: (5px groove #FFA500)]
+      RenderBlock {P} at (0,210) size 784x28 [border: (5px groove #FFA500)]
         RenderText {#text} at (5,5) size 126x19
           text run at (5,5) width 126: "Orange and groove."
-      RenderBlock {P} at (0,260) size 784x29 [border: (5px ridge #FFA500)]
+      RenderBlock {P} at (0,254) size 784x28 [border: (5px ridge #FFA500)]
         RenderText {#text} at (5,5) size 114x19
           text run at (5,5) width 114: "Orange and ridge."
-      RenderBlock {P} at (0,305) size 784x29 [border: (5px inset #FFA500)]
+      RenderBlock {P} at (0,298) size 784x28 [border: (5px inset #FFA500)]
         RenderText {#text} at (5,5) size 111x19
           text run at (5,5) width 111: "Orange and inset."
-      RenderBlock {P} at (0,350) size 784x29 [border: (5px outset #FFA500)]
+      RenderBlock {P} at (0,342) size 784x28 [border: (5px outset #FFA500)]
         RenderText {#text} at (5,5) size 119x19
           text run at (5,5) width 119: "Orange and outset."
-      RenderBlock {P} at (0,395) size 784x29 [border: (5px double #0000FF) (5px groove #0000FF) (5px double #0000FF) (5px groove #0000FF)]
+      RenderBlock {P} at (0,386) size 784x28 [border: (5px double #0000FF) (5px groove #0000FF) (5px double #0000FF) (5px groove #0000FF)]
         RenderText {#text} at (5,5) size 475x19
           text run at (5,5) width 475: "Blue and double on top and bottom; Blue and grooved on the left and right."
-      RenderBlock {P} at (0,440) size 784x29 [border: (5px dotted #0000FF) (5px double #0000FF) (5px dashed #0000FF) (5px solid #0000FF)]
+      RenderBlock {P} at (0,430) size 784x28 [border: (5px dotted #0000FF) (5px double #0000FF) (5px dashed #0000FF) (5px solid #0000FF)]
         RenderText {#text} at (5,5) size 521x19
           text run at (5,5) width 521: "Blue borders which are, in clockwise order from top: dotted, double, dashed, solid."
-      RenderBlock {P} at (0,485) size 784x19
+      RenderBlock {P} at (0,474) size 784x18
         RenderText {#text} at (0,0) size 278x19
           text run at (0,0) width 278: "This paragraph should have no border at all."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt
index 72d27f6..30f3f0f 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt
@@ -1,22 +1,22 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,16) size 784x124
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x152
+  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 269x19
           text run at (0,0) width 269: "The borders below should be as described:"
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 126x29 [border: (5px dashed #000000)]
           RenderText {#text} at (5,0) size 116x19
             text run at (5,0) width 116: "Black and dashed."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,70) size 784x19
+      RenderBlock {P} at (0,68) size 784x18
         RenderInline {SPAN} at (0,0) size 144x29 [border: (5px groove #FFA500)]
           RenderText {#text} at (5,0) size 134x19
             text run at (5,0) width 134: "Orange and grooved."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,105) size 784x19
+      RenderBlock {P} at (0,102) size 784x18
         RenderInline {SPAN} at (0,0) size 69x19
           RenderText {#text} at (0,0) size 69x19
             text run at (0,0) width 69: "No border."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-00-a-expected.txt
index 106f375..c3e4394 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-00-a-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x29 [color=#0000FF] [border: (10px double #0000FF) none]
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x63
+      RenderBlock {P} at (0,0) size 784x28 [color=#0000FF] [border: (10px double #0000FF) none]
         RenderText {#text} at (0,10) size 376x19
           text run at (0,10) width 376: "This paragraph should have two blue lines directly above it."
-      RenderBlock {P} at (0,45) size 784x20 [color=#0000FF] [border: (1px solid #0000FF) none]
+      RenderBlock {P} at (0,44) size 784x19 [color=#0000FF] [border: (1px solid #0000FF) none]
         RenderText {#text} at (0,1) size 422x19
           text run at (0,1) width 422: "This paragraph should have a single thin blue line directly above it."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-01-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
index 44ee3cd..cd06f1e 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
@@ -1,61 +1,61 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x301
-  RenderBlock {HTML} at (0,0) size 800x301
-    RenderBody {BODY} at (8,16) size 784x269 [color=#0000FF]
-      RenderBlock {P} at (0,0) size 784x38
+layer at (0,0) size 800x290
+  RenderBlock {HTML} at (0,0) size 800x290
+    RenderBody {BODY} at (8,16) size 784x258 [color=#0000FF]
+      RenderBlock {P} at (0,0) size 784x36
         RenderText {#text} at (0,0) size 483x19
           text run at (0,0) width 483: "There should be a solid blue line directly over every occurance of the word \""
         RenderInline {SPAN} at (0,0) size 60x21 [border: (2px solid #0000FF) none]
           RenderText {#text} at (483,0) size 60x19
             text run at (483,0) width 60: "HERE \x{21E7}"
-        RenderText {#text} at (543,0) size 776x38
+        RenderText {#text} at (543,0) size 776x37
           text run at (543,0) width 233: "\". (So there should be 8 blue lines on"
-          text run at (0,19) width 65: "this page.)"
-      RenderTable {TABLE} at (0,54) size 136x79
-        RenderTableSection {TBODY} at (0,0) size 136x79
-          RenderTableRow {TR} at (0,2) size 136x23
-            RenderTableCell {TD} at (2,2) size 132x23 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+          text run at (0,18) width 65: "this page.)"
+      RenderTable {TABLE} at (0,52) size 136x76
+        RenderTableSection {TBODY} at (0,0) size 136x76
+          RenderTableRow {TR} at (0,2) size 136x22
+            RenderTableCell {TD} at (2,2) size 132x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
               RenderText {#text} at (36,3) size 60x19
                 text run at (36,3) width 60: "HERE \x{21E7}"
-          RenderTableRow {TR} at (0,27) size 136x50
-            RenderTableCell {TD} at (2,40) size 62x23 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,26) size 136x48
+            RenderTableCell {TD} at (2,39) size 62x22 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,3) size 60x19
                 text run at (1,3) width 60: "HERE \x{21E7}"
-            RenderTableCell {TD} at (66,27) size 68x50 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderBlock (anonymous) at (1,3) size 66x19
+            RenderTableCell {TD} at (66,26) size 68x48 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (1,3) size 66x18
                 RenderText {#text} at (3,0) size 60x19
                   text run at (3,0) width 60: "HERE \x{21E7}"
-              RenderTable {TABLE} at (1,22) size 66x27
-                RenderTableSection {TBODY} at (0,0) size 66x27
-                  RenderTableRow {TR} at (0,2) size 66x23
-                    RenderTableCell {TD} at (2,2) size 62x23 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (1,21) size 66x26
+                RenderTableSection {TBODY} at (0,0) size 66x26
+                  RenderTableRow {TR} at (0,2) size 66x22
+                    RenderTableCell {TD} at (2,2) size 62x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,3) size 60x19
                         text run at (1,3) width 60: "HERE \x{21E7}"
-      RenderBlock {UL} at (0,149) size 784x120
-        RenderListItem {LI} at (40,0) size 744x78 [border: (2px solid #0000FF) none]
-          RenderBlock (anonymous) at (0,2) size 744x19
+      RenderBlock {UL} at (0,144) size 784x114
+        RenderListItem {LI} at (40,0) size 744x74 [border: (2px solid #0000FF) none]
+          RenderBlock (anonymous) at (0,2) size 744x18
             RenderListMarker at (-18,0) size 7x19: bullet
             RenderText {#text} at (0,0) size 60x19
               text run at (0,0) width 60: "HERE \x{21E7}"
-          RenderBlock {UL} at (0,21) size 744x57
-            RenderListItem {LI} at (40,0) size 704x19
+          RenderBlock {UL} at (0,20) size 744x54
+            RenderListItem {LI} at (40,0) size 704x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-            RenderListItem {LI} at (40,19) size 704x19
+            RenderListItem {LI} at (40,18) size 704x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-            RenderListItem {LI} at (40,38) size 704x19
+            RenderListItem {LI} at (40,36) size 704x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-        RenderListItem {LI} at (40,78) size 744x21 [border: (2px solid #0000FF) none]
+        RenderListItem {LI} at (40,74) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,2) size 7x19: bullet
           RenderText {#text} at (0,2) size 60x19
             text run at (0,2) width 60: "HERE \x{21E7}"
-        RenderListItem {LI} at (40,99) size 744x21 [border: (2px solid #0000FF) none]
+        RenderListItem {LI} at (40,94) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,2) size 7x19: bullet
           RenderText {#text} at (0,2) size 60x19
             text run at (0,2) width 60: "HERE \x{21E7}"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt
index 6b735a9..d71b423 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt
@@ -1,54 +1,54 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x333
-  RenderBlock {HTML} at (0,0) size 800x333
-    RenderBody {BODY} at (8,8) size 784x317
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,8) size 784x302
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "The blue bits of text should be decorated as described."
-      RenderBlock {P} at (0,35) size 784x247 [color=#C0C0C0]
-        RenderText {#text} at (0,0) size 759x76
+      RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0]
+        RenderText {#text} at (0,0) size 759x73
           text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (474,0) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,19) width 185: "text dummy text dummy text "
-          text run at (185,19) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,19) width 75: "dummy text"
-          text run at (0,38) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (395,38) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (0,57) width 106: "text dummy text "
-          text run at (106,57) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (0,18) width 185: "text dummy text dummy text "
+          text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,18) width 75: "dummy text"
+          text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (395,36) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (0,54) width 106: "text dummy text "
+          text run at (106,54) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 130x29 [color=#0000FF] [border: (10px double #0000FF) none]
-          RenderText {#text} at (580,57) size 130x19
-            text run at (580,57) width 130: "two blue lines above"
-        RenderText {#text} at (710,57) size 762x114
-          text run at (710,57) width 52: " dummy"
-          text run at (0,76) width 106: "text dummy text "
-          text run at (106,76) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (580,76) width 154: "dummy text dummy text"
-          text run at (0,95) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (316,95) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
-          text run at (0,114) width 27: "text "
-          text run at (27,114) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (501,114) width 233: "dummy text dummy text dummy text"
-          text run at (0,133) width 237: "dummy text dummy text dummy text "
-          text run at (237,133) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (711,133) width 48: "dummy"
-          text run at (0,152) width 106: "text dummy text "
+          RenderText {#text} at (580,54) size 130x19
+            text run at (580,54) width 130: "two blue lines above"
+        RenderText {#text} at (710,54) size 762x109
+          text run at (710,54) width 52: " dummy"
+          text run at (0,72) width 106: "text dummy text "
+          text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (580,72) width 154: "dummy text dummy text"
+          text run at (0,90) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
+          text run at (0,108) width 27: "text "
+          text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (501,108) width 233: "dummy text dummy text dummy text"
+          text run at (0,126) width 237: "dummy text dummy text dummy text "
+          text run at (237,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (711,126) width 48: "dummy"
+          text run at (0,144) width 106: "text dummy text "
         RenderInline {SPAN} at (0,0) size 151x20 [color=#0000FF] [border: (1px solid #0000FF) none]
-          RenderText {#text} at (106,152) size 151x19
-            text run at (106,152) width 113: "one thin blue line "
-            text run at (219,152) width 38: "above"
-        RenderText {#text} at (257,152) size 783x95
-          text run at (257,152) width 399: " dummy text dummy text dummy text dummy text dummy text "
-          text run at (656,152) width 127: "dummy text dummy"
-          text run at (0,171) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (343,171) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,190) width 79: "dummy text "
-          text run at (79,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (553,190) width 206: "dummy text dummy text dummy"
-          text run at (0,209) width 264: "text dummy text dummy text dummy text "
-          text run at (264,209) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,228) width 312: "dummy text dummy text dummy text dummy text"
-      RenderBlock {DIV} at (0,298) size 784x19
+          RenderText {#text} at (106,144) size 151x19
+            text run at (106,144) width 113: "one thin blue line "
+            text run at (219,144) width 38: "above"
+        RenderText {#text} at (257,144) size 783x91
+          text run at (257,144) width 399: " dummy text dummy text dummy text dummy text dummy text "
+          text run at (656,144) width 127: "dummy text dummy"
+          text run at (0,162) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (343,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,180) width 79: "dummy text "
+          text run at (79,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (553,180) width 206: "dummy text dummy text dummy"
+          text run at (0,198) width 264: "text dummy text dummy text dummy text "
+          text run at (264,198) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,216) width 312: "dummy text dummy text dummy text dummy text"
+      RenderBlock {DIV} at (0,284) size 784x18
         RenderText {#text} at (0,0) size 416x19
           text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
index a47c16a..c91ca21 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
@@ -1,37 +1,37 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x238
-  RenderBlock {HTML} at (0,0) size 800x238
-    RenderBody {BODY} at (8,16) size 784x206
-      RenderBlock {P} at (0,0) size 764x95 [color=#0000FF] [border: (10px double #0000FF) none]
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x196
+      RenderBlock {P} at (0,0) size 764x90 [color=#0000FF] [border: (10px double #0000FF) none]
         RenderText {#text} at (0,0) size 363x19
           text run at (0,0) width 363: "This paragraph should have two blue lines on its right. \x{21E8} "
-        RenderInline {SPAN} at (0,0) size 754x95 [color=#C0C0C0]
-          RenderText {#text} at (363,0) size 754x95
+        RenderInline {SPAN} at (0,0) size 754x91 [color=#C0C0C0]
+          RenderText {#text} at (363,0) size 754x91
             text run at (363,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,19) width 52: "dummy "
-            text run at (52,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,19) width 181: "text dummy text dummy text"
-            text run at (0,38) width 289: "dummy text dummy text dummy text dummy "
-            text run at (289,38) width 418: "text dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,57) width 52: "dummy "
-            text run at (52,57) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,57) width 181: "text dummy text dummy text"
-            text run at (0,76) width 154: "dummy text dummy text"
+            text run at (0,18) width 52: "dummy "
+            text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,18) width 181: "text dummy text dummy text"
+            text run at (0,36) width 289: "dummy text dummy text dummy text dummy "
+            text run at (289,36) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,54) width 52: "dummy "
+            text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,54) width 181: "text dummy text dummy text"
+            text run at (0,72) width 154: "dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,111) size 764x95 [color=#0000FF] [border: (1px solid #0000FF) none]
+      RenderBlock {P} at (0,106) size 764x90 [color=#0000FF] [border: (1px solid #0000FF) none]
         RenderText {#text} at (0,0) size 368x19
           text run at (0,0) width 368: "This paragraph should have a thin blue line on its right. \x{21E8} "
-        RenderInline {SPAN} at (0,0) size 759x95 [color=#C0C0C0]
-          RenderText {#text} at (368,0) size 759x95
+        RenderInline {SPAN} at (0,0) size 759x91 [color=#C0C0C0]
+          RenderText {#text} at (368,0) size 759x91
             text run at (368,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,19) width 52: "dummy "
-            text run at (52,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,19) width 233: "text dummy text dummy text dummy"
-            text run at (0,38) width 237: "text dummy text dummy text dummy "
-            text run at (237,38) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (711,38) width 23: "text"
-            text run at (0,57) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (447,57) width 312: "text dummy text dummy text dummy text dummy"
-            text run at (0,76) width 23: "text"
+            text run at (0,18) width 52: "dummy "
+            text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,18) width 233: "text dummy text dummy text dummy"
+            text run at (0,36) width 237: "text dummy text dummy text dummy "
+            text run at (237,36) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (711,36) width 23: "text"
+            text run at (0,54) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (447,54) width 312: "text dummy text dummy text dummy text dummy"
+            text run at (0,72) width 23: "text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-02-e-expected.txt
index 02101e8..aab75f3 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5519-brdr-r-02-e-expected.txt
@@ -1,55 +1,55 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x352
-  RenderBlock {HTML} at (0,0) size 800x352
-    RenderBody {BODY} at (8,16) size 784x320 [color=#0000FF]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x336
+  RenderBlock {HTML} at (0,0) size 800x336
+    RenderBody {BODY} at (8,16) size 784x304 [color=#0000FF]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 748x19
           text run at (0,0) width 364: "There should be a solid line to the right of the text below, "
           text run at (364,0) width 384: "having three segments each of a different colour as indicated."
-      RenderBlock {UL} at (0,35) size 588x285
-        RenderListItem {LI} at (40,0) size 548x76 [border: (3px solid #FFA500) none]
-          RenderBlock (anonymous) at (0,0) size 545x19
+      RenderBlock {UL} at (0,34) size 588x270
+        RenderListItem {LI} at (40,0) size 548x72 [border: (3px solid #FFA500) none]
+          RenderBlock (anonymous) at (0,0) size 545x18
             RenderListMarker at (-18,0) size 7x19: bullet
             RenderText {#text} at (0,0) size 106x19
               text run at (0,0) width 106: "Orange orange..."
-          RenderBlock {UL} at (0,19) size 409x57
-            RenderListItem {LI} at (40,0) size 369x19
+          RenderBlock {UL} at (0,18) size 409x54
+            RenderListItem {LI} at (40,0) size 369x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 114x19
                 text run at (0,0) width 114: "...orange orange..."
-            RenderListItem {LI} at (40,19) size 369x19
+            RenderListItem {LI} at (40,18) size 369x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 114x19
                 text run at (0,0) width 114: "...orange orange..."
-            RenderListItem {LI} at (40,38) size 369x19
+            RenderListItem {LI} at (40,36) size 369x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 106x19
                 text run at (0,0) width 106: "...orange orange."
-        RenderListItem {LI} at (40,76) size 548x19 [border: (3px solid #00FF00) none]
+        RenderListItem {LI} at (40,72) size 548x18 [border: (3px solid #00FF00) none]
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 37x19
             text run at (0,0) width 37: "Lime."
-        RenderListItem {LI} at (40,95) size 548x190 [border: (3px solid #FFFF00) none]
+        RenderListItem {LI} at (40,90) size 548x180 [border: (3px solid #FFFF00) none]
           RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (0,0) size 517x190
+          RenderText {#text} at (0,0) size 517x181
             text run at (0,0) width 333: "Yellow yellow yellow yellow yellow yellow yellow "
             text run at (333,0) width 184: "yellow yellow yellow yellow"
-            text run at (0,19) width 235: "yellow yellow yellow yellow yellow "
-            text run at (235,19) width 278: "yellow yellow yellow yellow yellow yellow"
-            text run at (0,38) width 141: "yellow yellow yellow "
-            text run at (141,38) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow"
-            text run at (0,57) width 47: "yellow "
-            text run at (47,57) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (470,57) width 43: "yellow"
-            text run at (0,76) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (376,76) width 137: "yellow yellow yellow"
-            text run at (0,95) width 282: "yellow yellow yellow yellow yellow yellow "
-            text run at (282,95) width 231: "yellow yellow yellow yellow yellow"
-            text run at (0,114) width 188: "yellow yellow yellow yellow "
-            text run at (188,114) width 325: "yellow yellow yellow yellow yellow yellow yellow"
-            text run at (0,133) width 94: "yellow yellow "
-            text run at (94,133) width 419: "yellow yellow yellow yellow yellow yellow yellow yellow yellow"
-            text run at (0,152) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (423,152) width 90: "yellow yellow"
-            text run at (0,171) width 282: "yellow yellow yellow yellow yellow yellow."
+            text run at (0,18) width 235: "yellow yellow yellow yellow yellow "
+            text run at (235,18) width 278: "yellow yellow yellow yellow yellow yellow"
+            text run at (0,36) width 141: "yellow yellow yellow "
+            text run at (141,36) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow"
+            text run at (0,54) width 47: "yellow "
+            text run at (47,54) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (470,54) width 43: "yellow"
+            text run at (0,72) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (376,72) width 137: "yellow yellow yellow"
+            text run at (0,90) width 282: "yellow yellow yellow yellow yellow yellow "
+            text run at (282,90) width 231: "yellow yellow yellow yellow yellow"
+            text run at (0,108) width 188: "yellow yellow yellow yellow "
+            text run at (188,108) width 325: "yellow yellow yellow yellow yellow yellow yellow"
+            text run at (0,126) width 94: "yellow yellow "
+            text run at (94,126) width 419: "yellow yellow yellow yellow yellow yellow yellow yellow yellow"
+            text run at (0,144) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (423,144) width 90: "yellow yellow"
+            text run at (0,162) width 282: "yellow yellow yellow yellow yellow yellow."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt
index 986cb4c..ff7da52 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt
@@ -1,56 +1,56 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x333
-  RenderBlock {HTML} at (0,0) size 800x333
-    RenderBody {BODY} at (8,8) size 784x317
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,8) size 784x302
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "The blue bits of text should be decorated as described."
-      RenderBlock {P} at (0,35) size 784x247 [color=#C0C0C0]
-        RenderText {#text} at (0,0) size 759x57
+      RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0]
+        RenderText {#text} at (0,0) size 759x55
           text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (474,0) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,19) width 185: "text dummy text dummy text "
-          text run at (185,19) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,19) width 75: "dummy text"
-          text run at (0,38) width 395: "dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 759x38 [color=#0000FF] [border: (10px double #0000FF) none]
-          RenderInline {SPAN} at (0,0) size 759x38 [color=#C0C0C0]
-            RenderText {#text} at (395,38) size 759x38
-              text run at (395,38) width 316: "dummy text dummy text dummy text dummy text "
-              text run at (711,38) width 48: "dummy"
-              text run at (0,57) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-              text run at (422,57) width 154: "dummy text dummy text"
-          RenderText {#text} at (576,57) size 131x19
-            text run at (576,57) width 131: " two blue lines here: "
-        RenderText {#text} at (717,57) size 765x114
-          text run at (717,57) width 48: "dummy"
-          text run at (0,76) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-          text run at (474,76) width 260: "text dummy text dummy text dummy text"
-          text run at (0,95) width 210: "dummy text dummy text dummy "
-          text run at (210,95) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-          text run at (684,95) width 75: "text dummy"
-          text run at (0,114) width 395: "text dummy text dummy text dummy text dummy text dummy "
-          text run at (395,114) width 339: "text dummy text dummy text dummy text dummy text"
-          text run at (0,133) width 131: "dummy text dummy "
-          text run at (131,133) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-          text run at (605,133) width 154: "text dummy text dummy"
-          text run at (0,152) width 106: "text dummy text "
+          text run at (0,18) width 185: "text dummy text dummy text "
+          text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,18) width 75: "dummy text"
+          text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
+        RenderInline {SPAN} at (0,0) size 759x37 [color=#0000FF] [border: (10px double #0000FF) none]
+          RenderInline {SPAN} at (0,0) size 759x37 [color=#C0C0C0]
+            RenderText {#text} at (395,36) size 759x37
+              text run at (395,36) width 316: "dummy text dummy text dummy text dummy text "
+              text run at (711,36) width 48: "dummy"
+              text run at (0,54) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+              text run at (422,54) width 154: "dummy text dummy text"
+          RenderText {#text} at (576,54) size 131x19
+            text run at (576,54) width 131: " two blue lines here: "
+        RenderText {#text} at (717,54) size 765x109
+          text run at (717,54) width 48: "dummy"
+          text run at (0,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+          text run at (474,72) width 260: "text dummy text dummy text dummy text"
+          text run at (0,90) width 210: "dummy text dummy text dummy "
+          text run at (210,90) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+          text run at (684,90) width 75: "text dummy"
+          text run at (0,108) width 395: "text dummy text dummy text dummy text dummy text dummy "
+          text run at (395,108) width 339: "text dummy text dummy text dummy text dummy text"
+          text run at (0,126) width 131: "dummy text dummy "
+          text run at (131,126) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+          text run at (605,126) width 154: "text dummy text dummy"
+          text run at (0,144) width 106: "text dummy text "
         RenderInline {SPAN} at (0,0) size 149x19 [color=#0000FF] [border: (1px solid #0000FF) none]
-          RenderText {#text} at (106,152) size 148x19
-            text run at (106,152) width 55: "one thin "
-            text run at (161,152) width 93: "blue line here: "
-        RenderText {#text} at (255,152) size 777x95
-          text run at (255,152) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (571,152) width 206: "dummy text dummy text dummy"
-          text run at (0,171) width 264: "text dummy text dummy text dummy text "
-          text run at (264,171) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (474,190) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,209) width 185: "text dummy text dummy text "
-          text run at (185,209) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,209) width 75: "dummy text"
-          text run at (0,228) width 312: "dummy text dummy text dummy text dummy text"
-      RenderBlock {DIV} at (0,298) size 784x19
+          RenderText {#text} at (106,144) size 148x19
+            text run at (106,144) width 55: "one thin "
+            text run at (161,144) width 93: "blue line here: "
+        RenderText {#text} at (255,144) size 777x91
+          text run at (255,144) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (571,144) width 206: "dummy text dummy text dummy"
+          text run at (0,162) width 264: "text dummy text dummy text dummy text "
+          text run at (264,162) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (474,180) width 285: "dummy text dummy text dummy text dummy"
+          text run at (0,198) width 185: "text dummy text dummy text "
+          text run at (185,198) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,198) width 75: "dummy text"
+          text run at (0,216) width 312: "dummy text dummy text dummy text dummy text"
+      RenderBlock {DIV} at (0,284) size 784x18
         RenderText {#text} at (0,0) size 416x19
           text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
index 0b14d47..f8f3801 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x65
-      RenderBlock {P} at (0,0) size 784x29 [color=#0000FF] [border: (10px double #0000FF) none]
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x63
+      RenderBlock {P} at (0,0) size 784x28 [color=#0000FF] [border: (10px double #0000FF) none]
         RenderText {#text} at (0,0) size 374x19
           text run at (0,0) width 374: "This paragraph should have two blue lines directly under it."
-      RenderBlock {P} at (0,45) size 784x20 [color=#0000FF] [border: (1px solid #0000FF) none]
+      RenderBlock {P} at (0,44) size 784x19 [color=#0000FF] [border: (1px solid #0000FF) none]
         RenderText {#text} at (0,0) size 420x19
           text run at (0,0) width 420: "This paragraph should have a single thin blue line directly under it."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-01-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
index dd0be92..e9bc1b1 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
@@ -1,61 +1,61 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x301
-  RenderBlock {HTML} at (0,0) size 800x301
-    RenderBody {BODY} at (8,16) size 784x269 [color=#0000FF]
-      RenderBlock {P} at (0,0) size 784x38
+layer at (0,0) size 800x290
+  RenderBlock {HTML} at (0,0) size 800x290
+    RenderBody {BODY} at (8,16) size 784x258 [color=#0000FF]
+      RenderBlock {P} at (0,0) size 784x36
         RenderText {#text} at (0,0) size 496x19
           text run at (0,0) width 496: "There should be a solid blue line directly under every occurrence of the word \""
         RenderInline {SPAN} at (0,0) size 60x21 [border: (2px solid #0000FF) none]
           RenderText {#text} at (496,0) size 60x19
             text run at (496,0) width 60: "HERE \x{21E9}"
-        RenderText {#text} at (556,0) size 769x38
+        RenderText {#text} at (556,0) size 769x37
           text run at (556,0) width 213: "\". (So there should be 8 blue lines"
-          text run at (0,19) width 85: "on this page.)"
-      RenderTable {TABLE} at (0,54) size 136x79
-        RenderTableSection {TBODY} at (0,0) size 136x79
-          RenderTableRow {TR} at (0,2) size 136x23
-            RenderTableCell {TD} at (2,2) size 132x23 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+          text run at (0,18) width 85: "on this page.)"
+      RenderTable {TABLE} at (0,52) size 136x76
+        RenderTableSection {TBODY} at (0,0) size 136x76
+          RenderTableRow {TR} at (0,2) size 136x22
+            RenderTableCell {TD} at (2,2) size 132x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
               RenderText {#text} at (36,1) size 60x19
                 text run at (36,1) width 60: "HERE \x{21E9}"
-          RenderTableRow {TR} at (0,27) size 136x50
-            RenderTableCell {TD} at (2,40) size 62x23 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,26) size 136x48
+            RenderTableCell {TD} at (2,39) size 62x22 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 60x19
                 text run at (1,1) width 60: "HERE \x{21E9}"
-            RenderTableCell {TD} at (66,27) size 68x50 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderTable {TABLE} at (1,1) size 66x27
-                RenderTableSection {TBODY} at (0,0) size 66x27
-                  RenderTableRow {TR} at (0,2) size 66x23
-                    RenderTableCell {TD} at (2,2) size 62x23 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (66,26) size 68x48 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (1,1) size 66x26
+                RenderTableSection {TBODY} at (0,0) size 66x26
+                  RenderTableRow {TR} at (0,2) size 66x22
+                    RenderTableCell {TD} at (2,2) size 62x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 60x19
                         text run at (1,1) width 60: "HERE \x{21E9}"
-              RenderBlock (anonymous) at (1,28) size 66x19
+              RenderBlock (anonymous) at (1,27) size 66x18
                 RenderText {#text} at (3,0) size 60x19
                   text run at (3,0) width 60: "HERE \x{21E9}"
-      RenderBlock {UL} at (0,149) size 784x120
-        RenderListItem {LI} at (40,0) size 744x78 [border: (2px solid #0000FF) none]
-          RenderBlock {UL} at (0,0) size 744x57
-            RenderListItem {LI} at (40,0) size 704x19
+      RenderBlock {UL} at (0,144) size 784x114
+        RenderListItem {LI} at (40,0) size 744x74 [border: (2px solid #0000FF) none]
+          RenderBlock {UL} at (0,0) size 744x54
+            RenderListItem {LI} at (40,0) size 704x18
               RenderListMarker at (-58,0) size 7x19: bullet
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-            RenderListItem {LI} at (40,19) size 704x19
+            RenderListItem {LI} at (40,18) size 704x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-            RenderListItem {LI} at (40,38) size 704x19
+            RenderListItem {LI} at (40,36) size 704x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 75x19
                 text run at (0,0) width 75: "dummy text"
-          RenderBlock (anonymous) at (0,57) size 744x19
+          RenderBlock (anonymous) at (0,54) size 744x18
             RenderText {#text} at (0,0) size 60x19
               text run at (0,0) width 60: "HERE \x{21E9}"
-        RenderListItem {LI} at (40,78) size 744x21 [border: (2px solid #0000FF) none]
+        RenderListItem {LI} at (40,74) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 60x19
             text run at (0,0) width 60: "HERE \x{21E9}"
-        RenderListItem {LI} at (40,99) size 744x21 [border: (2px solid #0000FF) none]
+        RenderListItem {LI} at (40,94) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 60x19
             text run at (0,0) width 60: "HERE \x{21E9}"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt
index d9ebce8..2d38c1c 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt
@@ -1,54 +1,54 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x333
-  RenderBlock {HTML} at (0,0) size 800x333
-    RenderBody {BODY} at (8,8) size 784x317
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,8) size 784x302
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "The blue bits of text should be decorated as described."
-      RenderBlock {P} at (0,35) size 784x247 [color=#C0C0C0]
-        RenderText {#text} at (0,0) size 759x76
+      RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0]
+        RenderText {#text} at (0,0) size 759x73
           text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (474,0) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,19) width 185: "text dummy text dummy text "
-          text run at (185,19) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,19) width 75: "dummy text"
-          text run at (0,38) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (395,38) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (0,57) width 106: "text dummy text "
-          text run at (106,57) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (0,18) width 185: "text dummy text dummy text "
+          text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,18) width 75: "dummy text"
+          text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (395,36) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (0,54) width 106: "text dummy text "
+          text run at (106,54) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 131x29 [color=#0000FF] [border: (10px double #0000FF) none]
-          RenderText {#text} at (580,57) size 131x19
-            text run at (580,57) width 131: "two blue lines below"
-        RenderText {#text} at (711,57) size 763x114
-          text run at (711,57) width 52: " dummy"
-          text run at (0,76) width 106: "text dummy text "
-          text run at (106,76) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (580,76) width 154: "dummy text dummy text"
-          text run at (0,95) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (316,95) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
-          text run at (0,114) width 27: "text "
-          text run at (27,114) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (501,114) width 233: "dummy text dummy text dummy text"
-          text run at (0,133) width 237: "dummy text dummy text dummy text "
-          text run at (237,133) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (711,133) width 48: "dummy"
-          text run at (0,152) width 106: "text dummy text "
+          RenderText {#text} at (580,54) size 131x19
+            text run at (580,54) width 131: "two blue lines below"
+        RenderText {#text} at (711,54) size 763x109
+          text run at (711,54) width 52: " dummy"
+          text run at (0,72) width 106: "text dummy text "
+          text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (580,72) width 154: "dummy text dummy text"
+          text run at (0,90) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
+          text run at (0,108) width 27: "text "
+          text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (501,108) width 233: "dummy text dummy text dummy text"
+          text run at (0,126) width 237: "dummy text dummy text dummy text "
+          text run at (237,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (711,126) width 48: "dummy"
+          text run at (0,144) width 106: "text dummy text "
         RenderInline {SPAN} at (0,0) size 152x20 [color=#0000FF] [border: (1px solid #0000FF) none]
-          RenderText {#text} at (106,152) size 152x19
-            text run at (106,152) width 113: "one thin blue line "
-            text run at (219,152) width 39: "below"
-        RenderText {#text} at (258,152) size 784x95
-          text run at (258,152) width 399: " dummy text dummy text dummy text dummy text dummy text "
-          text run at (657,152) width 127: "dummy text dummy"
-          text run at (0,171) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (343,171) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,190) width 79: "dummy text "
-          text run at (79,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (553,190) width 206: "dummy text dummy text dummy"
-          text run at (0,209) width 264: "text dummy text dummy text dummy text "
-          text run at (264,209) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,228) width 312: "dummy text dummy text dummy text dummy text"
-      RenderBlock {DIV} at (0,298) size 784x19
+          RenderText {#text} at (106,144) size 152x19
+            text run at (106,144) width 113: "one thin blue line "
+            text run at (219,144) width 39: "below"
+        RenderText {#text} at (258,144) size 784x91
+          text run at (258,144) width 399: " dummy text dummy text dummy text dummy text dummy text "
+          text run at (657,144) width 127: "dummy text dummy"
+          text run at (0,162) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (343,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,180) width 79: "dummy text "
+          text run at (79,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (553,180) width 206: "dummy text dummy text dummy"
+          text run at (0,198) width 264: "text dummy text dummy text dummy text "
+          text run at (264,198) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,216) width 312: "dummy text dummy text dummy text dummy text"
+      RenderBlock {DIV} at (0,284) size 784x18
         RenderText {#text} at (0,0) size 416x19
           text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
index 8d4e227..76f476b 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
@@ -1,37 +1,37 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x238
-  RenderBlock {HTML} at (0,0) size 800x238
-    RenderBody {BODY} at (8,16) size 784x206
-      RenderBlock {P} at (20,0) size 764x95 [color=#0000FF] [border: (10px double #0000FF)]
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x196
+      RenderBlock {P} at (20,0) size 764x90 [color=#0000FF] [border: (10px double #0000FF)]
         RenderText {#text} at (10,0) size 354x19
           text run at (10,0) width 354: "\x{21E6} This paragraph should have two blue lines on its left. "
-        RenderInline {SPAN} at (0,0) size 745x95 [color=#C0C0C0]
-          RenderText {#text} at (364,0) size 745x95
+        RenderInline {SPAN} at (0,0) size 745x91 [color=#C0C0C0]
+          RenderText {#text} at (364,0) size 745x91
             text run at (364,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (10,19) width 52: "dummy "
-            text run at (62,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (536,19) width 181: "text dummy text dummy text"
-            text run at (10,38) width 289: "dummy text dummy text dummy text dummy "
-            text run at (299,38) width 418: "text dummy text dummy text dummy text dummy text dummy text"
-            text run at (10,57) width 52: "dummy "
-            text run at (62,57) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (536,57) width 181: "text dummy text dummy text"
-            text run at (10,76) width 154: "dummy text dummy text"
+            text run at (10,18) width 52: "dummy "
+            text run at (62,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (536,18) width 181: "text dummy text dummy text"
+            text run at (10,36) width 289: "dummy text dummy text dummy text dummy "
+            text run at (299,36) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (10,54) width 52: "dummy "
+            text run at (62,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (536,54) width 181: "text dummy text dummy text"
+            text run at (10,72) width 154: "dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (20,111) size 764x95 [color=#0000FF] [border: (1px solid #0000FF)]
+      RenderBlock {P} at (20,106) size 764x90 [color=#0000FF] [border: (1px solid #0000FF)]
         RenderText {#text} at (1,0) size 359x19
           text run at (1,0) width 359: "\x{21E6} This paragraph should have a thin blue line on its left. "
-        RenderInline {SPAN} at (0,0) size 759x95 [color=#C0C0C0]
-          RenderText {#text} at (360,0) size 759x95
+        RenderInline {SPAN} at (0,0) size 759x91 [color=#C0C0C0]
+          RenderText {#text} at (360,0) size 759x91
             text run at (360,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (1,19) width 52: "dummy "
-            text run at (53,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (527,19) width 233: "text dummy text dummy text dummy"
-            text run at (1,38) width 237: "text dummy text dummy text dummy "
-            text run at (238,38) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (712,38) width 23: "text"
-            text run at (1,57) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (448,57) width 312: "text dummy text dummy text dummy text dummy"
-            text run at (1,76) width 23: "text"
+            text run at (1,18) width 52: "dummy "
+            text run at (53,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (527,18) width 233: "text dummy text dummy text dummy"
+            text run at (1,36) width 237: "text dummy text dummy text dummy "
+            text run at (238,36) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (712,36) width 23: "text"
+            text run at (1,54) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (448,54) width 312: "text dummy text dummy text dummy text dummy"
+            text run at (1,72) width 23: "text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-02-e-expected.txt
index 80c520d..c576fd2 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5521-brdr-l-02-e-expected.txt
@@ -1,53 +1,53 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x295
-  RenderBlock {HTML} at (0,0) size 800x295
-    RenderBody {BODY} at (8,16) size 784x263 [color=#0000FF]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x282
+  RenderBlock {HTML} at (0,0) size 800x282
+    RenderBody {BODY} at (8,16) size 784x250 [color=#0000FF]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 739x19
           text run at (0,0) width 355: "There should be a solid line to the left of the text below, "
           text run at (355,0) width 384: "having three segments each of a different colour as indicated."
-      RenderBlock {UL} at (0,35) size 784x228
-        RenderListItem {LI} at (40,0) size 744x76 [border: (3px solid #FFA500)]
-          RenderBlock (anonymous) at (3,0) size 741x19
+      RenderBlock {UL} at (0,34) size 784x216
+        RenderListItem {LI} at (40,0) size 744x72 [border: (3px solid #FFA500)]
+          RenderBlock (anonymous) at (3,0) size 741x18
             RenderListMarker at (-21,0) size 7x19: bullet
             RenderText {#text} at (0,0) size 106x19
               text run at (0,0) width 106: "Orange orange..."
-          RenderBlock {UL} at (3,19) size 741x57
-            RenderListItem {LI} at (40,0) size 701x19
+          RenderBlock {UL} at (3,18) size 741x54
+            RenderListItem {LI} at (40,0) size 701x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 114x19
                 text run at (0,0) width 114: "...orange orange..."
-            RenderListItem {LI} at (40,19) size 701x19
+            RenderListItem {LI} at (40,18) size 701x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 114x19
                 text run at (0,0) width 114: "...orange orange..."
-            RenderListItem {LI} at (40,38) size 701x19
+            RenderListItem {LI} at (40,36) size 701x18
               RenderListMarker at (-18,0) size 7x19: white bullet
               RenderText {#text} at (0,0) size 106x19
                 text run at (0,0) width 106: "...orange orange."
-        RenderListItem {LI} at (40,76) size 744x19 [border: (3px solid #00FF00)]
+        RenderListItem {LI} at (40,72) size 744x18 [border: (3px solid #00FF00)]
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (3,0) size 37x19
             text run at (3,0) width 37: "Lime."
-        RenderListItem {LI} at (40,95) size 744x133 [border: (3px solid #FFFF00)]
+        RenderListItem {LI} at (40,90) size 744x126 [border: (3px solid #FFFF00)]
           RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (3,0) size 705x133
+          RenderText {#text} at (3,0) size 705x127
             text run at (3,0) width 333: "Yellow yellow yellow yellow yellow yellow yellow "
             text run at (336,0) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow"
-            text run at (3,19) width 47: "yellow "
-            text run at (50,19) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (473,19) width 231: "yellow yellow yellow yellow yellow"
-            text run at (3,38) width 188: "yellow yellow yellow yellow "
-            text run at (191,38) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (614,38) width 90: "yellow yellow"
-            text run at (3,57) width 329: "yellow yellow yellow yellow yellow yellow yellow "
-            text run at (332,57) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow"
-            text run at (3,76) width 47: "yellow "
-            text run at (50,76) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (473,76) width 231: "yellow yellow yellow yellow yellow"
-            text run at (3,95) width 188: "yellow yellow yellow yellow "
-            text run at (191,95) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
-            text run at (614,95) width 90: "yellow yellow"
-            text run at (3,114) width 329: "yellow yellow yellow yellow yellow yellow yellow "
-            text run at (332,114) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow."
+            text run at (3,18) width 47: "yellow "
+            text run at (50,18) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (473,18) width 231: "yellow yellow yellow yellow yellow"
+            text run at (3,36) width 188: "yellow yellow yellow yellow "
+            text run at (191,36) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (614,36) width 90: "yellow yellow"
+            text run at (3,54) width 329: "yellow yellow yellow yellow yellow yellow yellow "
+            text run at (332,54) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow"
+            text run at (3,72) width 47: "yellow "
+            text run at (50,72) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (473,72) width 231: "yellow yellow yellow yellow yellow"
+            text run at (3,90) width 188: "yellow yellow yellow yellow "
+            text run at (191,90) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow "
+            text run at (614,90) width 90: "yellow yellow"
+            text run at (3,108) width 329: "yellow yellow yellow yellow yellow yellow yellow "
+            text run at (332,108) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
index 90f92f7..b1b21d3 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
@@ -1,57 +1,57 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x333
-  RenderBlock {HTML} at (0,0) size 800x333
-    RenderBody {BODY} at (8,8) size 784x317
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,8) size 784x302
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "The blue bits of text should be decorated as described."
-      RenderBlock {P} at (0,35) size 784x247 [color=#C0C0C0]
-        RenderText {#text} at (0,0) size 759x57
+      RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0]
+        RenderText {#text} at (0,0) size 759x55
           text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (474,0) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,19) width 185: "text dummy text dummy text "
-          text run at (185,19) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,19) width 75: "dummy text"
-          text run at (0,38) width 395: "dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 783x38 [color=#0000FF] [border: (10px double #0000FF)]
-          RenderText {#text} at (405,38) size 172x19
-            text run at (405,38) width 172: "\x{21E6} two blue lines to the left "
-          RenderInline {SPAN} at (0,0) size 783x38 [color=#C0C0C0]
-            RenderText {#text} at (577,38) size 783x38
-              text run at (577,38) width 52: "dummy "
-              text run at (629,38) width 154: "text dummy text dummy"
-              text run at (0,57) width 316: "text dummy text dummy text dummy text dummy "
-              text run at (316,57) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,18) width 185: "text dummy text dummy text "
+          text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,18) width 75: "dummy text"
+          text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
+        RenderInline {SPAN} at (0,0) size 783x37 [color=#0000FF] [border: (10px double #0000FF)]
+          RenderText {#text} at (405,36) size 172x19
+            text run at (405,36) width 172: "\x{21E6} two blue lines to the left "
+          RenderInline {SPAN} at (0,0) size 783x37 [color=#C0C0C0]
+            RenderText {#text} at (577,36) size 783x37
+              text run at (577,36) width 52: "dummy "
+              text run at (629,36) width 154: "text dummy text dummy"
+              text run at (0,54) width 316: "text dummy text dummy text dummy text dummy "
+              text run at (316,54) width 418: "text dummy text dummy text dummy text dummy text dummy text"
           RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,76) size 759x95
-          text run at (0,76) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (395,76) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (0,95) width 106: "text dummy text "
-          text run at (106,95) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (580,95) width 154: "dummy text dummy text"
-          text run at (0,114) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (316,114) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
-          text run at (0,133) width 27: "text "
-          text run at (27,133) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (501,133) width 233: "dummy text dummy text dummy text"
-          text run at (0,152) width 158: "dummy text dummy text "
+        RenderText {#text} at (0,72) size 759x91
+          text run at (0,72) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (395,72) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (0,90) width 106: "text dummy text "
+          text run at (106,90) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (580,90) width 154: "dummy text dummy text"
+          text run at (0,108) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (316,108) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
+          text run at (0,126) width 27: "text "
+          text run at (27,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (501,126) width 233: "dummy text dummy text dummy text"
+          text run at (0,144) width 158: "dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 194x19 [color=#0000FF] [border: (1px solid #0000FF)]
-          RenderText {#text} at (159,152) size 193x19
-            text run at (159,152) width 193: "\x{21E6} one thin blue line to the left "
-        RenderText {#text} at (352,152) size 759x95
-          text run at (352,152) width 52: "dummy "
-          text run at (404,152) width 339: "text dummy text dummy text dummy text dummy text"
-          text run at (0,171) width 131: "dummy text dummy "
-          text run at (131,171) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-          text run at (605,171) width 154: "text dummy text dummy"
-          text run at (0,190) width 316: "text dummy text dummy text dummy text dummy "
-          text run at (316,190) width 418: "text dummy text dummy text dummy text dummy text dummy text"
-          text run at (0,209) width 52: "dummy "
-          text run at (52,209) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-          text run at (526,209) width 233: "text dummy text dummy text dummy"
-          text run at (0,228) width 237: "text dummy text dummy text dummy "
-          text run at (237,228) width 181: "text dummy text dummy text"
-      RenderBlock {DIV} at (0,298) size 784x19
+          RenderText {#text} at (159,144) size 193x19
+            text run at (159,144) width 193: "\x{21E6} one thin blue line to the left "
+        RenderText {#text} at (352,144) size 759x91
+          text run at (352,144) width 52: "dummy "
+          text run at (404,144) width 339: "text dummy text dummy text dummy text dummy text"
+          text run at (0,162) width 131: "dummy text dummy "
+          text run at (131,162) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+          text run at (605,162) width 154: "text dummy text dummy"
+          text run at (0,180) width 316: "text dummy text dummy text dummy text dummy "
+          text run at (316,180) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+          text run at (0,198) width 52: "dummy "
+          text run at (52,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+          text run at (526,198) width 233: "text dummy text dummy text dummy"
+          text run at (0,216) width 237: "text dummy text dummy text dummy "
+          text run at (237,216) width 181: "text dummy text dummy text"
+      RenderBlock {DIV} at (0,284) size 784x18
         RenderText {#text} at (0,0) size 416x19
           text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)"
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-00-b-expected.txt
index c4b6af5..dcc3c9d 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-00-b-expected.txt
@@ -1,32 +1,32 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x397
-  RenderBlock {HTML} at (0,0) size 800x397
-    RenderBody {BODY} at (8,16) size 784x365
-      RenderBlock {P} at (0,0) size 784x19 [color=#0000FF]
+layer at (0,0) size 800x388
+  RenderBlock {HTML} at (0,0) size 800x388
+    RenderBody {BODY} at (8,16) size 784x356
+      RenderBlock {P} at (0,0) size 784x18 [color=#0000FF]
         RenderText {#text} at (0,0) size 226x19
           text run at (0,0) width 226: "The borders should be as described."
-      RenderBlock {P} at (0,35) size 784x25 [color=#0000FF] [border: (3px solid #FFA500)]
+      RenderBlock {P} at (0,34) size 784x24 [color=#0000FF] [border: (3px solid #FFA500)]
         RenderText {#text} at (3,3) size 112x19
           text run at (3,3) width 112: "Orange and solid."
-      RenderBlock {P} at (0,76) size 784x29 [color=#0000FF] [border: (5px outset #FFA500)]
+      RenderBlock {P} at (0,74) size 784x28 [color=#0000FF] [border: (5px outset #FFA500)]
         RenderText {#text} at (5,5) size 119x19
           text run at (5,5) width 119: "Orange and outset."
-      RenderBlock {P} at (0,121) size 784x29 [color=#0000FF] [border: (5px inset #FFA500)]
+      RenderBlock {P} at (0,118) size 784x28 [color=#0000FF] [border: (5px inset #FFA500)]
         RenderText {#text} at (5,5) size 111x19
           text run at (5,5) width 111: "Orange and inset."
-      RenderBlock {P} at (0,166) size 784x39 [color=#0000FF] [border: (10px ridge #FFA500)]
+      RenderBlock {P} at (0,162) size 784x38 [color=#0000FF] [border: (10px ridge #FFA500)]
         RenderText {#text} at (10,10) size 122x19
           text run at (10,10) width 122: "Orange and ridged."
-      RenderBlock {P} at (0,221) size 784x39 [color=#0000FF] [border: (10px double #FFA500)]
+      RenderBlock {P} at (0,216) size 784x38 [color=#0000FF] [border: (10px double #FFA500)]
         RenderText {#text} at (10,10) size 125x19
           text run at (10,10) width 125: "Orange and double."
-      RenderBlock {P} at (0,276) size 784x19 [color=#0000FF]
+      RenderBlock {P} at (0,270) size 784x18 [color=#0000FF]
         RenderText {#text} at (0,0) size 69x19
           text run at (0,0) width 69: "No border."
-      RenderBlock {P} at (0,311) size 784x19 [color=#0000FF]
+      RenderBlock {P} at (0,304) size 784x18 [color=#0000FF]
         RenderText {#text} at (0,0) size 69x19
           text run at (0,0) width 69: "No border."
-      RenderBlock {P} at (0,346) size 784x19 [color=#0000FF]
+      RenderBlock {P} at (0,338) size 784x18 [color=#0000FF]
         RenderText {#text} at (0,0) size 69x19
           text run at (0,0) width 69: "No border."
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt
index 182cd21..f81169c 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x202
-  RenderBlock {HTML} at (0,0) size 800x202
-    RenderBody {BODY} at (8,16) size 784x154
-      RenderBlock {P} at (0,0) size 784x19 [color=#0000FF]
+layer at (0,0) size 800x200
+  RenderBlock {HTML} at (0,0) size 800x200
+    RenderBody {BODY} at (8,16) size 784x152
+      RenderBlock {P} at (0,0) size 784x18 [color=#0000FF]
         RenderText {#text} at (0,0) size 264x19
           text run at (0,0) width 264: "There should be no border around the cat:"
-      RenderBlock {DIV} at (32,51) size 720x103 [color=#FF0000]
+      RenderBlock {DIV} at (32,50) size 720x102 [color=#FF0000]
         RenderInline {A} at (0,0) size 98x19 [color=#0000EE]
           RenderImage {IMG} at (0,0) size 98x99
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
index 7989fa9..09bdfea 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x82
-  RenderBlock {HTML} at (0,0) size 800x82
-    RenderBody {BODY} at (8,8) size 784x66 [color=#0000FF]
-      RenderTable {TABLE} at (0,0) size 708x66
-        RenderTableSection {TBODY} at (0,0) size 708x66
-          RenderTableRow {TR} at (0,2) size 708x25
-            RenderTableCell {TD} at (2,2) size 704x25 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2]
+layer at (0,0) size 800x80
+  RenderBlock {HTML} at (0,0) size 800x80
+    RenderBody {BODY} at (8,8) size 784x64 [color=#0000FF]
+      RenderTable {TABLE} at (0,0) size 708x64
+        RenderTableSection {TBODY} at (0,0) size 708x64
+          RenderTableRow {TR} at (0,2) size 708x24
+            RenderTableCell {TD} at (2,2) size 704x24 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2]
               RenderText {#text} at (3,3) size 325x19
                 text run at (3,3) width 325: "There should be a blue border around this sentence."
-          RenderTableRow {TR} at (0,29) size 708x35
-            RenderTableCell {TD} at (2,34) size 331x25 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,28) size 708x34
+            RenderTableCell {TD} at (2,33) size 331x24 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (3,3) size 325x19
                 text run at (3,3) width 325: "There should be a blue border around this sentence."
-            RenderTableCell {TD} at (335,29) size 371x35 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1]
-              RenderTable {TABLE} at (3,3) size 365x29
-                RenderTableSection {TBODY} at (0,0) size 365x29
-                  RenderTableRow {TR} at (0,2) size 365x25
-                    RenderTableCell {TD} at (2,2) size 361x25 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (335,28) size 371x34 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (3,3) size 365x28
+                RenderTableSection {TBODY} at (0,0) size 365x28
+                  RenderTableRow {TR} at (0,2) size 365x24
+                    RenderTableCell {TD} at (2,2) size 361x24 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (3,3) size 106x19
                         text run at (3,3) width 106: "There should be "
                       RenderInline {STRONG} at (0,0) size 113x19
diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-ibrdr-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-ibrdr-00-a-expected.txt
index 293da40..7df51f9 100644
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-ibrdr-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-ibrdr-00-a-expected.txt
@@ -1,53 +1,53 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x314
-  RenderBlock {HTML} at (0,0) size 800x314
-    RenderBody {BODY} at (8,8) size 784x298
-      RenderBlock {DIV} at (0,0) size 784x19
+layer at (0,0) size 800x300
+  RenderBlock {HTML} at (0,0) size 800x300
+    RenderBody {BODY} at (8,8) size 784x284
+      RenderBlock {DIV} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "The blue bits of text should be decorated as described."
-      RenderBlock {P} at (0,35) size 784x228 [color=#C0C0C0]
-        RenderText {#text} at (0,0) size 759x57
+      RenderBlock {P} at (0,34) size 784x216 [color=#C0C0C0]
+        RenderText {#text} at (0,0) size 759x55
           text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (474,0) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,19) width 185: "text dummy text dummy text "
-          text run at (185,19) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,19) width 75: "dummy text"
-          text run at (0,38) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (0,18) width 185: "text dummy text dummy text "
+          text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,18) width 75: "dummy text"
+          text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 259x39 [color=#0000FF] [border: (10px double #0000FF)]
-          RenderText {#text} at (405,38) size 239x19
-            text run at (405,38) width 239: "two blue lines all around this blue text"
-        RenderText {#text} at (654,38) size 759x114
-          text run at (654,38) width 4: " "
-          text run at (658,38) width 75: "dummy text"
-          text run at (0,57) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (395,57) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (0,76) width 106: "text dummy text "
-          text run at (106,76) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (580,76) width 154: "dummy text dummy text"
-          text run at (0,95) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (316,95) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
-          text run at (0,114) width 27: "text "
-          text run at (27,114) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (501,114) width 233: "dummy text dummy text dummy text"
-          text run at (0,133) width 79: "dummy text "
+          RenderText {#text} at (405,36) size 239x19
+            text run at (405,36) width 239: "two blue lines all around this blue text"
+        RenderText {#text} at (654,36) size 759x109
+          text run at (654,36) width 4: " "
+          text run at (658,36) width 75: "dummy text"
+          text run at (0,54) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (395,54) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (0,72) width 106: "text dummy text "
+          text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (580,72) width 154: "dummy text dummy text"
+          text run at (0,90) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy"
+          text run at (0,108) width 27: "text "
+          text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (501,108) width 233: "dummy text dummy text dummy text"
+          text run at (0,126) width 79: "dummy text "
         RenderInline {SPAN} at (0,0) size 234x21 [color=#0000FF] [border: (1px solid #0000FF)]
-          RenderText {#text} at (80,133) size 232x19
-            text run at (80,133) width 27: "one "
-            text run at (107,133) width 205: "blue line all around this blue text"
-        RenderText {#text} at (313,133) size 760x95
-          text run at (313,133) width 162: " dummy text dummy text "
-          text run at (475,133) width 285: "dummy text dummy text dummy text dummy"
-          text run at (0,152) width 185: "text dummy text dummy text "
-          text run at (185,152) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (659,152) width 75: "dummy text"
-          text run at (0,171) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (395,171) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (0,190) width 106: "text dummy text "
-          text run at (106,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (580,190) width 154: "dummy text dummy text"
-          text run at (0,209) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (316,209) width 75: "dummy text"
-      RenderBlock {DIV} at (0,279) size 784x19
+          RenderText {#text} at (80,126) size 232x19
+            text run at (80,126) width 27: "one "
+            text run at (107,126) width 205: "blue line all around this blue text"
+        RenderText {#text} at (313,126) size 760x91
+          text run at (313,126) width 162: " dummy text dummy text "
+          text run at (475,126) width 285: "dummy text dummy text dummy text dummy"
+          text run at (0,144) width 185: "text dummy text dummy text "
+          text run at (185,144) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (659,144) width 75: "dummy text"
+          text run at (0,162) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (395,162) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (0,180) width 106: "text dummy text "
+          text run at (106,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (580,180) width 154: "dummy text dummy text"
+          text run at (0,198) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (316,198) width 75: "dummy text"
+      RenderBlock {DIV} at (0,266) size 784x18
         RenderText {#text} at (0,0) size 416x19
           text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)"
diff --git a/LayoutTests/platform/efl/css2.1/t090204-display-change-01-b-ao-expected.txt b/LayoutTests/platform/efl/css2.1/t090204-display-change-01-b-ao-expected.txt
index 235507b..72f8169 100644
--- a/LayoutTests/platform/efl/css2.1/t090204-display-change-01-b-ao-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090204-display-change-01-b-ao-expected.txt
@@ -1,14 +1,14 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
-  RenderBlock {HTML} at (0,0) size 800x93
-    RenderBody {BODY} at (8,16) size 784x69
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x90
+  RenderBlock {HTML} at (0,0) size 800x90
+    RenderBody {BODY} at (8,16) size 784x66
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 268x19
           text run at (0,0) width 268: "There should be no red below, only green."
-      RenderBlock (floating) {DIV} at (0,35) size 784x17 [color=#008000] [bgcolor=#FF0000]
+      RenderBlock (floating) {DIV} at (0,34) size 784x16 [color=#008000] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 16x17
           text run at (0,0) width 16: "X"
-      RenderBlock {DIV} at (0,35) size 16x34 [color=#008000] [bgcolor=#FF0000]
-        RenderText {#text} at (0,17) size 16x17
-          text run at (0,17) width 16: "X"
+      RenderBlock {DIV} at (0,34) size 16x32 [color=#008000] [bgcolor=#FF0000]
+        RenderText {#text} at (0,16) size 16x17
+          text run at (0,16) width 16: "X"
diff --git a/LayoutTests/platform/efl/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt
index 1bb5970..93347d2 100644
--- a/LayoutTests/platform/efl/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x187
-  RenderBlock {HTML} at (0,0) size 800x187
-    RenderBody {BODY} at (8,16) size 784x163
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x186
+  RenderBlock {HTML} at (0,0) size 800x186
+    RenderBody {BODY} at (8,16) size 784x162
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 482x19
           text run at (0,0) width 482: "The two diagrams below should be identical to the pixel with no red present."
-      RenderTable {TABLE} at (0,35) size 434x128
+      RenderTable {TABLE} at (0,34) size 434x128
         RenderTableSection {TBODY} at (0,0) size 434x128
           RenderTableRow {TR} at (0,2) size 434x124
             RenderTableCell {TD} at (2,2) size 214x124 [border: (2px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-00-d-expected.txt
index c98b16d..03f513e 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-00-d-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x175
-  RenderBlock {HTML} at (0,0) size 800x175
-    RenderBody {BODY} at (8,16) size 784x105
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x170
+  RenderBlock {HTML} at (0,0) size 800x170
+    RenderBody {BODY} at (8,16) size 784x102
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 404x19
           text run at (0,0) width 404: "The two patterns below should be identical, with no red present."
-      RenderBlock {DIV} at (0,35) size 784x70
-        RenderBlock {DIV} at (16,16) size 160x19 [color=#FFFF00] [bgcolor=#000080]
+      RenderBlock {DIV} at (0,34) size 784x68
+        RenderBlock {DIV} at (16,16) size 160x18 [color=#FFFF00] [bgcolor=#000080]
           RenderText {#text} at (0,0) size 12x19
             text run at (0,0) width 12: " *"
-        RenderBlock {DIV} at (96,35) size 160x19 [color=#FFFF00] [bgcolor=#000080]
+        RenderBlock {DIV} at (96,34) size 160x18 [color=#FFFF00] [bgcolor=#000080]
           RenderText {#text} at (148,0) size 12x19
             text run at (148,0) width 12: "* "
-      RenderBlock {DIV} at (16,121) size 240x0
+      RenderBlock {DIV} at (16,118) size 240x0
         RenderBlock {DIV} at (0,0) size 240x0 [bgcolor=#FF0000]
-          RenderBlock (floating) {P} at (0,0) size 160x19 [color=#FFFF00] [bgcolor=#000080]
+          RenderBlock (floating) {P} at (0,0) size 160x18 [color=#FFFF00] [bgcolor=#000080]
             RenderText {#text} at (0,0) size 12x19
               text run at (0,0) width 12: " *"
-          RenderBlock (floating) {P} at (80,19) size 160x19 [color=#FFFF00] [bgcolor=#000080]
+          RenderBlock (floating) {P} at (80,18) size 160x18 [color=#FFFF00] [bgcolor=#000080]
             RenderText {#text} at (148,0) size 12x19
               text run at (148,0) width 12: "* "
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-01-d-g-expected.txt
index 645fbf1..9719f0b 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-01-d-g-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x163
-  RenderBlock {HTML} at (0,0) size 800x163
-    RenderBody {BODY} at (8,16) size 784x99
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x162
+  RenderBlock {HTML} at (0,0) size 800x162
+    RenderBody {BODY} at (8,16) size 784x98
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 404x19
           text run at (0,0) width 404: "The two patterns below should be identical, with no red present."
-      RenderBlock {DIV} at (0,35) size 784x64
+      RenderBlock {DIV} at (0,34) size 784x64
         RenderImage {IMG} at (16,16) size 160x16 [color=#FFFF00] [bgcolor=#FF0000]
         RenderImage {IMG} at (96,32) size 160x16 [color=#FFFF00] [bgcolor=#FF0000]
-      RenderBlock {DIV} at (16,115) size 240x0
+      RenderBlock {DIV} at (16,114) size 240x0
         RenderBlock {DIV} at (0,0) size 240x0 [bgcolor=#FF0000]
           RenderImage {IMG} at (0,0) size 160x16 [color=#FFFF00]
           RenderImage {IMG} at (80,16) size 160x16 [color=#FFFF00]
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-02-c-expected.txt
index 1b4b5b0..18f5ae6 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-02-c-expected.txt
@@ -1,43 +1,43 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x275
-  RenderBlock {HTML} at (0,0) size 800x275
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
-        RenderText {#text} at (0,0) size 779x38
+layer at (0,0) size 800x268
+  RenderBlock {HTML} at (0,0) size 800x268
+    RenderBody {BODY} at (8,16) size 784x36
+      RenderBlock {P} at (0,0) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 779x37
           text run at (0,0) width 423: "The blue boxes below should be in numeric order and form a \"D\". "
           text run at (423,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes"
-          text run at (0,19) width 53: "labelled "
-          text run at (53,19) width 355: "\"B\" should be in the second; arrows indicate the correct "
-          text run at (408,19) width 71: "alignment.)"
-      RenderBlock {DIV} at (16,54) size 320x0
-        RenderBlock (floating) {P} at (4,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+          text run at (0,18) width 53: "labelled "
+          text run at (53,18) width 355: "\"B\" should be in the second; arrows indicate the correct "
+          text run at (408,18) width 71: "alignment.)"
+      RenderBlock {DIV} at (16,52) size 320x0
+        RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 1"
-        RenderBlock (floating) {P} at (138,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 40x19
             text run at (7,7) width 40: "\x{21E6} B 2"
-        RenderBlock (floating) {P} at (4,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 3"
-        RenderBlock (floating) {P} at (190,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 4 \x{21E8}"
-        RenderBlock (floating) {P} at (4,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 5"
-        RenderBlock (floating) {P} at (190,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 6 \x{21E8}"
-        RenderBlock (floating) {P} at (190,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 8 \x{21E8}"
-        RenderBlock (floating) {P} at (4,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 7"
-        RenderBlock (floating) {P} at (4,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 9"
-        RenderBlock (floating) {P} at (138,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (138,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 48x19
             text run at (7,7) width 48: "\x{21E6} B 10"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-03-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-03-c-expected.txt
index ee1a61f..49391eb 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-03-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-03-c-expected.txt
@@ -1,43 +1,43 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x275
-  RenderBlock {HTML} at (0,0) size 800x275
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
-        RenderText {#text} at (0,0) size 755x38
+layer at (0,0) size 800x268
+  RenderBlock {HTML} at (0,0) size 800x268
+    RenderBody {BODY} at (8,16) size 784x36
+      RenderBlock {P} at (0,0) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 755x37
           text run at (0,0) width 389: "The blue boxes below should be in numeric order and form a "
           text run at (389,0) width 366: "backwards \"D\". (Boxes labelled \"A\" should be in the first"
-          text run at (0,19) width 55: "column; "
-          text run at (55,19) width 402: "boxes labelled \"B\" should be in the second; arrows indicate the "
-          text run at (457,19) width 118: "correct alignment.)"
-      RenderBlock {DIV} at (16,54) size 320x0
-        RenderBlock (floating) {P} at (190,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+          text run at (0,18) width 55: "column; "
+          text run at (55,18) width 402: "boxes labelled \"B\" should be in the second; arrows indicate the "
+          text run at (457,18) width 118: "correct alignment.)"
+      RenderBlock {DIV} at (16,52) size 320x0
+        RenderBlock (floating) {P} at (190,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 2 \x{21E8}"
-        RenderBlock (floating) {P} at (56,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (56,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (78,7) size 41x19
             text run at (78,7) width 41: "A 1 \x{21E8}"
-        RenderBlock (floating) {P} at (190,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 4 \x{21E8}"
-        RenderBlock (floating) {P} at (4,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 3"
-        RenderBlock (floating) {P} at (190,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 6 \x{21E8}"
-        RenderBlock (floating) {P} at (4,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 5"
-        RenderBlock (floating) {P} at (4,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 7"
-        RenderBlock (floating) {P} at (190,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 8 \x{21E8}"
-        RenderBlock (floating) {P} at (190,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (71,7) size 48x19
             text run at (71,7) width 48: "B 10 \x{21E8}"
-        RenderBlock (floating) {P} at (56,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (56,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (78,7) size 41x19
             text run at (78,7) width 41: "A 9 \x{21E8}"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-04-c-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-04-c-expected.txt
index f677d64..c5c7d31 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-04-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-04-c-expected.txt
@@ -1,55 +1,55 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x357
-  RenderBlock {HTML} at (0,0) size 800x357
-    RenderBody {BODY} at (8,16) size 784x38
-      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
-        RenderText {#text} at (0,0) size 778x38
+layer at (0,0) size 800x348
+  RenderBlock {HTML} at (0,0) size 800x348
+    RenderBody {BODY} at (8,16) size 784x36
+      RenderBlock {P} at (0,0) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 778x37
           text run at (0,0) width 422: "The blue boxes below should be in numeric order and form a \"B\". "
           text run at (422,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes"
-          text run at (0,19) width 53: "labelled "
-          text run at (53,19) width 355: "\"B\" should be in the second; arrows indicate the correct "
-          text run at (408,19) width 71: "alignment.)"
-      RenderBlock {DIV} at (16,54) size 320x0
-        RenderBlock (floating) {P} at (4,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+          text run at (0,18) width 53: "labelled "
+          text run at (53,18) width 355: "\"B\" should be in the second; arrows indicate the correct "
+          text run at (408,18) width 71: "alignment.)"
+      RenderBlock {DIV} at (16,52) size 320x0
+        RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 1"
-        RenderBlock (floating) {P} at (138,4) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 40x19
             text run at (7,7) width 40: "\x{21E6} B 2"
-        RenderBlock (floating) {P} at (4,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 3"
-        RenderBlock (floating) {P} at (190,45) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 4 \x{21E8}"
-        RenderBlock (floating) {P} at (4,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 5"
-        RenderBlock (floating) {P} at (190,86) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (79,7) size 40x19
             text run at (79,7) width 40: "B 6 \x{21E8}"
-        RenderBlock (floating) {P} at (4,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 7"
-        RenderBlock (floating) {P} at (138,127) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (138,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 40x19
             text run at (7,7) width 40: "\x{21E6} B 8"
-        RenderBlock (floating) {P} at (4,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 41x19
             text run at (7,7) width 41: "\x{21E6} A 9"
-        RenderBlock (floating) {P} at (190,168) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (71,7) size 48x19
             text run at (71,7) width 48: "B 10 \x{21E8}"
-        RenderBlock (floating) {P} at (4,209) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 49x19
             text run at (7,7) width 49: "\x{21E6} A 11"
-        RenderBlock (floating) {P} at (190,209) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (190,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (71,7) size 48x19
             text run at (71,7) width 48: "B 12 \x{21E8}"
-        RenderBlock (floating) {P} at (4,250) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (4,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 49x19
             text run at (7,7) width 49: "\x{21E6} A 13"
-        RenderBlock (floating) {P} at (138,250) size 126x33 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (138,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
           RenderText {#text} at (7,7) size 48x19
             text run at (7,7) width 48: "\x{21E6} B 14"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-00-d-expected.txt
index f685aa4..91ae232 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-00-d-expected.txt
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x137
-  RenderBlock {HTML} at (0,0) size 800x137
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x108
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 681x19
           text run at (0,0) width 681: "There should be five numbers, in numerical order, below: on the first line 1, 2 and 3, on the second, 4 and 5."
-      RenderBlock {DIV} at (10,35) size 262x76 [color=#000080] [border: (3px solid #0000FF)]
-        RenderBlock (floating) {P} at (19,19) size 80x19
+      RenderBlock {DIV} at (10,34) size 262x74 [color=#000080] [border: (3px solid #0000FF)]
+        RenderBlock (floating) {P} at (19,19) size 80x18
           RenderText {#text} at (0,0) size 8x19
             text run at (0,0) width 8: "1"
-        RenderBlock (floating) {P} at (99,19) size 80x19
+        RenderBlock (floating) {P} at (99,19) size 80x18
           RenderText {#text} at (0,0) size 8x19
             text run at (0,0) width 8: "2"
-        RenderBlock (floating) {P} at (19,38) size 80x19
+        RenderBlock (floating) {P} at (19,37) size 80x18
           RenderText {#text} at (0,0) size 8x19
             text run at (0,0) width 8: "4"
-        RenderText {#text} at (179,19) size 88x38
+        RenderText {#text} at (179,19) size 88x37
           text run at (179,19) width 8: "3"
-          text run at (99,38) width 88: "5                    "
+          text run at (99,37) width 88: "5                    "
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
index 6190a0c..04f1da3 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x271
-  RenderBlock {HTML} at (0,0) size 800x271
-    RenderBody {BODY} at (8,16) size 784x245
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x270
+  RenderBlock {HTML} at (0,0) size 800x270
+    RenderBody {BODY} at (8,16) size 784x244
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 766x19
           text run at (0,0) width 766: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below, slightly on the left (\x{21E6}) inside a blue box."
-      RenderBlock {DIV} at (10,35) size 260x210 [border: (5px solid #0000FF)]
+      RenderBlock {DIV} at (10,34) size 260x210 [border: (5px solid #0000FF)]
         RenderBlock (floating) {P} at (5,5) size 100x100 [color=#000080]
           RenderImage {IMG} at (0,0) size 100x100
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
index 209e7cd..955df10 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-00-e-expected.txt
@@ -1,26 +1,26 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x200
-  RenderBlock {HTML} at (0,0) size 800x200
-    RenderBody {BODY} at (8,16) size 784x168
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x192
+  RenderBlock {HTML} at (0,0) size 800x192
+    RenderBody {BODY} at (8,16) size 784x160
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 263x19
           text run at (0,0) width 263: "The word \"fail\" should not appear below."
-      RenderBlock {DIV} at (16,35) size 240x133 [color=#FFFFFF] [bgcolor=#FFFFFF]
-        RenderBlock (floating) {P} at (0,0) size 43x19 [color=#000080]
+      RenderBlock {DIV} at (16,34) size 240x126 [color=#FFFFFF] [bgcolor=#FFFFFF]
+        RenderBlock (floating) {P} at (0,0) size 43x18 [color=#000080]
           RenderText {#text} at (0,0) size 43x19
             text run at (0,0) width 43: "TEST:"
-        RenderBlock (floating) {P} at (1,19) size 239x19 [color=#00FFFF] [bgcolor=#008080]
+        RenderBlock (floating) {P} at (1,18) size 239x18 [color=#00FFFF] [bgcolor=#008080]
           RenderText {#text} at (100,0) size 39x19
             text run at (100,0) width 39: "PASS"
-        RenderText {#text} at (43,0) size 236x133
+        RenderText {#text} at (43,0) size 236x127
           text run at (43,0) width 188: "fail fail fail fail fail fail fail fail"
-          text run at (0,38) width 48: "fail fail "
-          text run at (48,38) width 188: "fail fail fail fail fail fail fail fail"
-          text run at (0,57) width 48: "fail fail "
-          text run at (48,57) width 188: "fail fail fail fail fail fail fail fail"
-          text run at (0,76) width 48: "fail fail "
-          text run at (48,76) width 188: "fail fail fail fail fail fail fail fail"
-          text run at (0,95) width 48: "fail fail "
-          text run at (48,95) width 188: "fail fail fail fail fail fail fail fail"
-          text run at (0,114) width 44: "fail fail"
+          text run at (0,36) width 48: "fail fail "
+          text run at (48,36) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,54) width 48: "fail fail "
+          text run at (48,54) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,72) width 48: "fail fail "
+          text run at (48,72) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,90) width 48: "fail fail "
+          text run at (48,90) width 188: "fail fail fail fail fail fail fail fail"
+          text run at (0,108) width 44: "fail fail"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
index 59ffa2e..3bb7750 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x164
-  RenderBlock {HTML} at (0,0) size 800x164
-    RenderBody {BODY} at (8,16) size 784x124
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x163
+  RenderBlock {HTML} at (0,0) size 800x163
+    RenderBody {BODY} at (8,16) size 784x122
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 382x19
           text run at (0,0) width 382: "The word \"fail\" should not appear below, just a green block."
-      RenderBlock {DIV} at (16,35) size 240x89 [color=#FFFFFF] [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (16,34) size 240x88 [color=#FFFFFF] [bgcolor=#FFFFFF]
         RenderImage {IMG} at (0,0) size 1x1
         RenderImage {IMG} at (0,1) size 240x112
         RenderInline {SPAN} at (0,0) size 188x89
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
index e3de93b..76479d4 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
@@ -1,12 +1,12 @@
 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
-    RenderBody {BODY} at (8,8) size 784x169
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x184
+  RenderBlock {HTML} at (0,0) size 800x184
+    RenderBody {BODY} at (8,8) size 784x168
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 273x19
           text run at (0,0) width 273: "There should be a green box to the right. \x{2798}"
-      RenderBlock {DIV} at (0,19) size 784x150 [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (0,18) size 784x150 [bgcolor=#FFFFFF]
         RenderBlock (floating) {P} at (458,10) size 316x91 [color=#008000] [border: (3px solid #008000)]
           RenderText {#text} at (8,8) size 300x75
             text run at (8,8) width 300: "x x xxxx xx xxxx x x"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-01-d-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-01-d-expected.txt
index d52feab..c00e72b 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-01-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltblck-01-d-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x134
-  RenderBlock {HTML} at (0,0) size 800x134
-    RenderBody {BODY} at (8,8) size 784x118
-      RenderBlock {DIV} at (0,0) size 784x118 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF) (96px solid #0000FF) (3px solid #0000FF)]
-        RenderBlock (floating) {DIV} at (421,11) size 352x70 [bgcolor=#008080]
-          RenderBlock {P} at (16,16) size 320x38
-            RenderText {#text} at (0,0) size 313x38
+layer at (0,0) size 800x133
+  RenderBlock {HTML} at (0,0) size 800x133
+    RenderBody {BODY} at (8,8) size 784x117
+      RenderBlock {DIV} at (0,0) size 784x117 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF) (96px solid #0000FF) (3px solid #0000FF)]
+        RenderBlock (floating) {DIV} at (421,11) size 352x68 [bgcolor=#008080]
+          RenderBlock {P} at (16,16) size 320x36
+            RenderText {#text} at (0,0) size 313x37
               text run at (0,0) width 313: "This teal box should start inside the dark blue box"
-              text run at (0,19) width 81: "and spill out "
-              text run at (81,19) width 171: "onto the blue area below it."
-        RenderBlock {P} at (3,3) size 778x19
+              text run at (0,18) width 81: "and spill out "
+              text run at (81,18) width 171: "onto the blue area below it."
+        RenderBlock {P} at (3,3) size 778x18
           RenderText {#text} at (0,0) size 256x19
             text run at (0,0) width 256: "You should see a teal box to the right. \x{21E8}"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt
index a8b4914..65695b0 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
-layer at (0,0) size 785x710
+layer at (0,0) size 785x709
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x710
-  RenderBlock {HTML} at (0,0) size 785x710
-    RenderBody {BODY} at (8,16) size 769x686
-      RenderBlock {P} at (0,0) size 769x19
+layer at (0,0) size 785x709
+  RenderBlock {HTML} at (0,0) size 785x709
+    RenderBody {BODY} at (8,16) size 769x685
+      RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 251x19
           text run at (0,0) width 251: "There should be a big green box below."
-      RenderBlock {DIV} at (0,35) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 50x50
         RenderBlock {P} at (3,18) size 300x90
           RenderText {#text} at (50,0) size 290x90
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
index 0f95e79..9f311fe 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
@@ -1,47 +1,47 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x274
-  RenderBlock {HTML} at (0,0) size 800x274
+layer at (0,0) size 800x260
+  RenderBlock {HTML} at (0,0) size 800x260
     RenderBody {BODY} at (8,8) size 784x0
-      RenderBlock (floating) {DIV} at (0,0) size 588x266 [color=#FFFFFF] [bgcolor=#000080]
-        RenderBlock (floating) {DIV} at (277,0) size 294x76 [color=#00FFFF] [bgcolor=#008080]
-          RenderBlock {P} at (0,0) size 294x76
-            RenderText {#text} at (0,0) size 294x76
+      RenderBlock (floating) {DIV} at (0,0) size 588x252 [color=#FFFFFF] [bgcolor=#000080]
+        RenderBlock (floating) {DIV} at (277,0) size 294x72 [color=#00FFFF] [bgcolor=#008080]
+          RenderBlock {P} at (0,0) size 294x72
+            RenderText {#text} at (0,0) size 294x73
               text run at (0,0) width 294: "To the right of this teal box there should be a"
-              text run at (0,19) width 94: "purple square, "
-              text run at (94,19) width 200: "tightly squeezed in between the"
-              text run at (0,38) width 193: "edge of the teal box and the "
-              text run at (193,38) width 101: "outside edge of"
-              text run at (0,57) width 110: "the blue block. \x{21E8}"
-        RenderBlock {P} at (0,0) size 588x266
-          RenderText {#text} at (0,0) size 277x38
+              text run at (0,18) width 94: "purple square, "
+              text run at (94,18) width 200: "tightly squeezed in between the"
+              text run at (0,36) width 193: "edge of the teal box and the "
+              text run at (193,36) width 101: "outside edge of"
+              text run at (0,54) width 110: "the blue block. \x{21E8}"
+        RenderBlock {P} at (0,0) size 588x252
+          RenderText {#text} at (0,0) size 277x37
             text run at (0,0) width 277: "Inside this blue block on the right there"
-            text run at (0,19) width 158: "should be a teal box. \x{21E8} "
-          RenderInline {SPAN} at (0,0) size 588x247 [color=#000080]
-            RenderText {#text} at (158,19) size 588x247
-              text run at (158,19) width 119: "FAIL FAIL FAIL"
-              text run at (0,38) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,57) width 80: "FAIL FAIL "
-              text run at (80,57) width 197: "FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,76) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
-              text run at (297,76) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,95) width 212: "FAIL FAIL FAIL FAIL FAIL "
-              text run at (212,95) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,114) width 127: "FAIL FAIL FAIL "
-              text run at (127,114) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,133) width 42: "FAIL "
-              text run at (42,133) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
-              text run at (552,133) width 36: "FAIL"
-              text run at (0,152) width 467: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
-              text run at (467,152) width 121: "FAIL FAIL FAIL"
-              text run at (0,171) width 382: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
-              text run at (382,171) width 206: "FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,190) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
-              text run at (297,190) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,209) width 212: "FAIL FAIL FAIL FAIL FAIL "
-              text run at (212,209) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,228) width 127: "FAIL FAIL FAIL "
-              text run at (127,228) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
-              text run at (0,247) width 40: "FAIL "
-              text run at (40,247) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+            text run at (0,18) width 158: "should be a teal box. \x{21E8} "
+          RenderInline {SPAN} at (0,0) size 588x235 [color=#000080]
+            RenderText {#text} at (158,18) size 588x235
+              text run at (158,18) width 119: "FAIL FAIL FAIL"
+              text run at (0,36) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,54) width 80: "FAIL FAIL "
+              text run at (80,54) width 197: "FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,72) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+              text run at (297,72) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,90) width 212: "FAIL FAIL FAIL FAIL FAIL "
+              text run at (212,90) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,108) width 127: "FAIL FAIL FAIL "
+              text run at (127,108) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,126) width 42: "FAIL "
+              text run at (42,126) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+              text run at (552,126) width 36: "FAIL"
+              text run at (0,144) width 467: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+              text run at (467,144) width 121: "FAIL FAIL FAIL"
+              text run at (0,162) width 382: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+              text run at (382,162) width 206: "FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,180) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+              text run at (297,180) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,198) width 212: "FAIL FAIL FAIL FAIL FAIL "
+              text run at (212,198) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,216) width 127: "FAIL FAIL FAIL "
+              text run at (127,216) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
+              text run at (0,234) width 40: "FAIL "
+              text run at (40,234) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-flthw-00-c-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
index 8f3e42b..d3a98ef 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
-  RenderBlock {HTML} at (0,0) size 800x259
-    RenderBody {BODY} at (8,16) size 784x235
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x258
+  RenderBlock {HTML} at (0,0) size 800x258
+    RenderBody {BODY} at (8,16) size 784x234
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 507x19
           text run at (0,0) width 507: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below."
-      RenderBlock {DIV} at (0,35) size 784x200
+      RenderBlock {DIV} at (0,34) size 784x200
         RenderBlock (floating) {DIV} at (0,0) size 100x100
         RenderBlock (floating) {DIV} at (0,100) size 100x100
         RenderBlock {DIV} at (100,0) size 684x200
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt
index 9bec1df..5cfac0c 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x183
-  RenderBlock {HTML} at (0,0) size 800x183
-    RenderBody {BODY} at (8,16) size 784x152
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x182
+  RenderBlock {HTML} at (0,0) size 800x182
+    RenderBody {BODY} at (8,16) size 784x151
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 274x19
           text run at (0,0) width 274: "There should be two boxes of green below."
-      RenderBlock {DIV} at (15,35) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (15,34) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock (floating) {SPAN} at (3,3) size 45x30
           RenderText {#text} at (0,0) size 30x30
             text run at (0,0) width 30: "X"
@@ -14,7 +14,7 @@
           text run at (48,3) width 45: "x x"
           text run at (48,18) width 30: "xx"
           text run at (3,33) width 45: "x x"
-      RenderBlock {DIV} at (15,101) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (15,100) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock (floating) {SPAN} at (3,3) size 45x30 [bgcolor=#008000]
           RenderText {#text} at (0,0) size 30x30
             text run at (0,0) width 30: "X"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt
index b96da17..5c99c23 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
-layer at (0,0) size 785x620
+layer at (0,0) size 785x619
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x620
-  RenderBlock {HTML} at (0,0) size 785x620
-    RenderBody {BODY} at (8,16) size 769x596
-      RenderBlock {P} at (0,0) size 769x19
+layer at (0,0) size 785x619
+  RenderBlock {HTML} at (0,0) size 785x619
+    RenderBody {BODY} at (8,16) size 769x595
+      RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 330x19
           text run at (0,0) width 330: "There should be a tall green box below, with no red."
-      RenderBlock {DIV} at (0,35) size 126x561 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 126x561 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {P} at (18,18) size 90x45
           RenderText {#text} at (0,0) size 90x45
             text run at (0,0) width 75: "x x x"
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
index be114fa..eec15d0 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
@@ -1,74 +1,74 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x231
-  RenderBlock {HTML} at (0,0) size 800x231
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x202
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 649x19
           text run at (0,0) width 388: "Below you should see four blocks side by side followed by a "
           text run at (388,0) width 261: "matching cross section of the four blocks."
-      RenderBlock (floating) {DIV} at (0,45) size 140x131 [bgcolor=#FFFF00] [border: (20px solid #000000)]
-        RenderBlock {P} at (40,56) size 60x19
+      RenderBlock (floating) {DIV} at (0,44) size 140x130 [bgcolor=#FFFF00] [border: (20px solid #000000)]
+        RenderBlock {P} at (40,56) size 60x18
           RenderText {#text} at (6,0) size 48x19
             text run at (6,0) width 48: "Yellow"
-      RenderBlock (floating) {DIV} at (160,45) size 140x131 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
-        RenderBlock {P} at (40,56) size 60x19
+      RenderBlock (floating) {DIV} at (160,44) size 140x130 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
+        RenderBlock {P} at (40,56) size 60x18
           RenderText {#text} at (15,0) size 30x19
             text run at (15,0) width 30: "Blue"
-      RenderBlock (floating) {DIV} at (320,45) size 140x131 [bgcolor=#FF0000] [border: (20px solid #000000)]
-        RenderBlock {P} at (40,56) size 60x19
+      RenderBlock (floating) {DIV} at (320,44) size 140x130 [bgcolor=#FF0000] [border: (20px solid #000000)]
+        RenderBlock {P} at (40,56) size 60x18
           RenderText {#text} at (17,0) size 26x19
             text run at (17,0) width 26: "Red"
-      RenderBlock (floating) {DIV} at (480,45) size 140x131 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
-        RenderBlock {P} at (40,56) size 60x19
+      RenderBlock (floating) {DIV} at (480,44) size 140x130 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
+        RenderBlock {P} at (40,56) size 60x18
           RenderText {#text} at (10,0) size 40x19
             text run at (10,0) width 40: "Green"
-      RenderBlock {DIV} at (0,186) size 784x19
-        RenderTable {TABLE} at (0,0) size 620x19
-          RenderTableSection {TBODY} at (0,0) size 620x19
-            RenderTableRow {TR} at (0,0) size 620x19
-              RenderTableCell {TD} at (0,0) size 20x19 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+      RenderBlock {DIV} at (0,184) size 784x18
+        RenderTable {TABLE} at (0,0) size 620x18
+          RenderTableSection {TBODY} at (0,0) size 620x18
+            RenderTableRow {TR} at (0,0) size 620x18
+              RenderTableCell {TD} at (0,0) size 20x18 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (20,0) size 100x19 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
+              RenderTableCell {TD} at (20,0) size 100x18 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (120,0) size 20x19 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
+              RenderTableCell {TD} at (120,0) size 20x18 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (140,0) size 20x19 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1]
+              RenderTableCell {TD} at (140,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (160,0) size 20x19 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1]
+              RenderTableCell {TD} at (160,0) size 20x18 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (180,0) size 100x19 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1]
+              RenderTableCell {TD} at (180,0) size 100x18 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (280,0) size 20x19 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1]
+              RenderTableCell {TD} at (280,0) size 20x18 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (300,0) size 20x19 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1]
+              RenderTableCell {TD} at (300,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (320,0) size 20x19 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1]
+              RenderTableCell {TD} at (320,0) size 20x18 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (340,0) size 100x19 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1]
+              RenderTableCell {TD} at (340,0) size 100x18 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (440,0) size 20x19 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1]
+              RenderTableCell {TD} at (440,0) size 20x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (460,0) size 20x19 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1]
+              RenderTableCell {TD} at (460,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (480,0) size 20x19 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1]
+              RenderTableCell {TD} at (480,0) size 20x18 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (500,0) size 100x19 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1]
+              RenderTableCell {TD} at (500,0) size 100x18 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
-              RenderTableCell {TD} at (600,0) size 20x19 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1]
+              RenderTableCell {TD} at (600,0) size 20x18 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1]
                 RenderText {#text} at (0,0) size 4x19
                   text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
index 5de38c2..1fd4210 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x46
-  RenderBlock {HTML} at (0,0) size 800x46
-    RenderBody {BODY} at (8,8) size 784x19
-      RenderBlock {DIV} at (0,0) size 784x19
-        RenderBlock {DIV} at (0,0) size 784x19
-          RenderBlock (floating) {P} at (392,0) size 392x38
+layer at (0,0) size 800x44
+  RenderBlock {HTML} at (0,0) size 800x44
+    RenderBody {BODY} at (8,8) size 784x18
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderBlock {DIV} at (0,0) size 784x18
+          RenderBlock (floating) {P} at (392,0) size 392x36
             RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
-            RenderText {#text} at (15,0) size 359x38
+            RenderText {#text} at (15,0) size 359x37
               text run at (15,0) width 4: " "
               text run at (19,0) width 340: "\x{21E6} There should be a green square at the top left of the"
-              text run at (0,19) width 56: "window."
+              text run at (0,18) width 56: "window."
           RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt
index a8b4914..65695b0 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
-layer at (0,0) size 785x710
+layer at (0,0) size 785x709
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x710
-  RenderBlock {HTML} at (0,0) size 785x710
-    RenderBody {BODY} at (8,16) size 769x686
-      RenderBlock {P} at (0,0) size 769x19
+layer at (0,0) size 785x709
+  RenderBlock {HTML} at (0,0) size 785x709
+    RenderBody {BODY} at (8,16) size 769x685
+      RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 251x19
           text run at (0,0) width 251: "There should be a big green box below."
-      RenderBlock {DIV} at (0,35) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 50x50
         RenderBlock {P} at (3,18) size 300x90
           RenderText {#text} at (50,0) size 290x90
diff --git a/LayoutTests/platform/efl/css2.1/t0905-c5526-flthw-00-c-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0905-c5526-flthw-00-c-g-expected.txt
index 8f3e42b..d3a98ef 100644
--- a/LayoutTests/platform/efl/css2.1/t0905-c5526-flthw-00-c-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0905-c5526-flthw-00-c-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
-  RenderBlock {HTML} at (0,0) size 800x259
-    RenderBody {BODY} at (8,16) size 784x235
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x258
+  RenderBlock {HTML} at (0,0) size 800x258
+    RenderBody {BODY} at (8,16) size 784x234
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 507x19
           text run at (0,0) width 507: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below."
-      RenderBlock {DIV} at (0,35) size 784x200
+      RenderBlock {DIV} at (0,34) size 784x200
         RenderBlock (floating) {DIV} at (0,0) size 100x100
         RenderBlock (floating) {DIV} at (0,100) size 100x100
         RenderBlock {DIV} at (100,0) size 684x200
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
index def8abd..52f4a6d 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-00-d-expected.txt
@@ -1,30 +1,30 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x178
-  RenderBlock {HTML} at (0,0) size 800x178
-    RenderBody {BODY} at (8,16) size 784x146
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x172
+  RenderBlock {HTML} at (0,0) size 800x172
+    RenderBody {BODY} at (8,16) size 784x140
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 589x19
           text run at (0,0) width 371: "In the following test, the teal blocks must be just inside the "
           text run at (371,0) width 218: "top and sides of the blue rectangle."
-      RenderBlock {DIV} at (0,35) size 784x111
-        RenderBlock {DIV} at (16,0) size 752x111 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)]
-          RenderBlock (floating) {P} at (8,8) size 176x92 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
-            RenderText {#text} at (8,8) size 146x76
+      RenderBlock {DIV} at (0,34) size 784x106
+        RenderBlock {DIV} at (16,0) size 752x106 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)]
+          RenderBlock (floating) {P} at (8,8) size 176x88 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
+            RenderText {#text} at (8,8) size 146x73
               text run at (8,8) width 146: "Teal block. Teal block."
-              text run at (8,27) width 146: "Teal block. Teal block."
-              text run at (8,46) width 146: "Teal block. Teal block."
-              text run at (8,65) width 146: "Teal block. Teal block."
-          RenderBlock (floating) {P} at (568,8) size 176x92 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
-            RenderText {#text} at (8,8) size 146x76
+              text run at (8,26) width 146: "Teal block. Teal block."
+              text run at (8,44) width 146: "Teal block. Teal block."
+              text run at (8,62) width 146: "Teal block. Teal block."
+          RenderBlock (floating) {P} at (568,8) size 176x88 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)]
+            RenderText {#text} at (8,8) size 146x73
               text run at (8,8) width 146: "Teal block. Teal block."
-              text run at (8,27) width 146: "Teal block. Teal block."
-              text run at (8,46) width 146: "Teal block. Teal block."
-              text run at (8,65) width 146: "Teal block. Teal block."
-          RenderText {#text} at (184,8) size 358x95
+              text run at (8,26) width 146: "Teal block. Teal block."
+              text run at (8,44) width 146: "Teal block. Teal block."
+              text run at (8,62) width 146: "Teal block. Teal block."
+          RenderText {#text} at (184,8) size 358x91
             text run at (184,8) width 327: "Blue rectangle. Blue rectangle. Blue rectangle. Blue"
-            text run at (184,27) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (184,46) width 99: "Blue rectangle. "
-            text run at (283,46) width 228: "Blue rectangle. Blue rectangle. Blue"
-            text run at (184,65) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (184,84) width 194: "Blue rectangle. Blue rectangle."
+            text run at (184,26) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (184,44) width 99: "Blue rectangle. "
+            text run at (283,44) width 228: "Blue rectangle. Blue rectangle. Blue"
+            text run at (184,62) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (184,80) width 194: "Blue rectangle. Blue rectangle."
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
index c3feaa8..84535a7 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x140
-  RenderBlock {HTML} at (0,0) size 800x140
-    RenderBody {BODY} at (8,16) size 784x108
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x136
+  RenderBlock {HTML} at (0,0) size 800x136
+    RenderBody {BODY} at (8,16) size 784x104
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 542x19
           text run at (0,0) width 542: "In the following test, the blue blocks should be on the given sides of the teal rectangle."
-      RenderBlock {DIV} at (0,35) size 784x73
-        RenderBlock {DIV} at (16,0) size 752x73 [color=#00FFFF] [bgcolor=#008080]
-          RenderBlock (floating) {P} at (8,8) size 176x54 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
-            RenderText {#text} at (8,8) size 132x38
+      RenderBlock {DIV} at (0,34) size 784x70
+        RenderBlock {DIV} at (16,0) size 752x70 [color=#00FFFF] [bgcolor=#008080]
+          RenderBlock (floating) {P} at (8,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
+            RenderText {#text} at (8,8) size 132x37
               text run at (8,8) width 115: "\x{21E6} This blue block"
-              text run at (8,27) width 132: "should be on the left."
-          RenderBlock (floating) {P} at (568,8) size 176x54 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
-            RenderText {#text} at (8,8) size 141x38
+              text run at (8,26) width 132: "should be on the left."
+          RenderBlock (floating) {P} at (568,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
+            RenderText {#text} at (8,8) size 141x37
               text run at (8,8) width 115: "\x{21E8} This blue block"
-              text run at (8,27) width 141: "should be on the right."
-          RenderText {#text} at (184,8) size 384x57
+              text run at (8,26) width 141: "should be on the right."
+          RenderText {#text} at (184,8) size 384x55
             text run at (184,8) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
-            text run at (184,27) width 194: "Teal rectangle. Teal rectangle. "
-            text run at (378,27) width 190: "Teal rectangle. Teal rectangle."
-            text run at (184,46) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
+            text run at (184,26) width 194: "Teal rectangle. Teal rectangle. "
+            text run at (378,26) width 190: "Teal rectangle. Teal rectangle."
+            text run at (184,44) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-02-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-02-d-g-expected.txt
index 859b788..9144095 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-02-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-02-d-g-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x219
-  RenderBlock {HTML} at (0,0) size 800x219
-    RenderBody {BODY} at (8,16) size 784x127
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x218
+  RenderBlock {HTML} at (0,0) size 800x218
+    RenderBody {BODY} at (8,16) size 784x122
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 595x19
           text run at (0,0) width 377: "In the following test, the teal squares must be just inside the "
           text run at (377,0) width 218: "top and sides of the blue rectangle."
-      RenderBlock {DIV} at (0,35) size 784x92
-        RenderBlock {DIV} at (16,0) size 752x92 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)]
+      RenderBlock {DIV} at (0,34) size 784x88
+        RenderBlock {DIV} at (16,0) size 752x88 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)]
           RenderImage {IMG} at (8,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000]
           RenderImage {IMG} at (584,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000]
-          RenderText {#text} at (168,8) size 392x76
+          RenderText {#text} at (168,8) size 392x73
             text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (168,27) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (168,46) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (168,65) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (168,26) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (168,62) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-03-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-03-b-g-expected.txt
index 79d9fb0..ade7a55 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-03-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-03-b-g-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x238
-  RenderBlock {HTML} at (0,0) size 800x238
-    RenderBody {BODY} at (8,16) size 784x127
-      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
+layer at (0,0) size 800x237
+  RenderBlock {HTML} at (0,0) size 800x237
+    RenderBody {BODY} at (8,16) size 784x123
+      RenderBlock {P} at (0,0) size 784x37 [color=#000080]
         RenderText {#text} at (0,0) size 396x19
           text run at (0,0) width 246: "In the following test, the purple square "
           text run at (246,0) width 150: "should be on the left (\x{21E6}"
@@ -14,12 +14,12 @@
         RenderText {#text} at (649,0) size 738x38
           text run at (649,0) width 89: "\x{21E8}) of the blue"
           text run at (0,19) width 61: "rectangle."
-      RenderBlock {DIV} at (0,54) size 784x73
-        RenderBlock {DIV} at (16,0) size 752x73 [color=#0000FF] [bgcolor=#000080]
+      RenderBlock {DIV} at (0,53) size 784x70
+        RenderBlock {DIV} at (16,0) size 752x70 [color=#0000FF] [bgcolor=#000080]
           RenderImage {IMG} at (8,8) size 160x160
           RenderImage {IMG} at (584,8) size 160x160
-          RenderText {#text} at (168,8) size 392x57
+          RenderText {#text} at (168,8) size 392x55
             text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
-            text run at (168,27) width 198: "Blue rectangle. Blue rectangle. "
-            text run at (366,27) width 194: "Blue rectangle. Blue rectangle."
-            text run at (168,46) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
+            text run at (168,26) width 198: "Blue rectangle. Blue rectangle. "
+            text run at (366,26) width 194: "Blue rectangle. Blue rectangle."
+            text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle."
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-00-d-expected.txt
index e689f44..43847f9 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-00-d-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x487
-  RenderBlock {HTML} at (0,0) size 800x487
-    RenderBody {BODY} at (8,16) size 784x455
-      RenderBlock {P} at (0,0) size 784x57 [color=#000080]
-        RenderText {#text} at (0,0) size 778x57
+layer at (0,0) size 800x484
+  RenderBlock {HTML} at (0,0) size 800x484
+    RenderBody {BODY} at (8,16) size 784x452
+      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
+        RenderText {#text} at (0,0) size 778x55
           text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
           text run at (408,0) width 329: "coloured boxes of the same color (unless there is not"
-          text run at (0,19) width 88: "enough room "
-          text run at (88,19) width 398: "for the big box to fit on the small box's line after the small box, "
-          text run at (486,19) width 292: "in which case the big box should be level with"
-          text run at (0,38) width 111: "the bottom of the "
-          text run at (111,38) width 137: "respective small box)."
-      RenderBlock {DIV} at (16,73) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
+          text run at (0,18) width 88: "enough room "
+          text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, "
+          text run at (486,18) width 292: "in which case the big box should be level with"
+          text run at (0,36) width 111: "the bottom of the "
+          text run at (111,36) width 137: "respective small box)."
+      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (171,21) size 474x19
           text run at (171,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 18x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
index bc067cb..fd25078 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x487
-  RenderBlock {HTML} at (0,0) size 800x487
-    RenderBody {BODY} at (8,16) size 784x455
-      RenderBlock {P} at (0,0) size 784x57 [color=#000080]
-        RenderText {#text} at (0,0) size 769x57
+layer at (0,0) size 800x484
+  RenderBlock {HTML} at (0,0) size 800x484
+    RenderBody {BODY} at (8,16) size 784x452
+      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
+        RenderText {#text} at (0,0) size 769x55
           text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
           text run at (408,0) width 329: "coloured boxes of the same color (unless there is not"
-          text run at (0,19) width 88: "enough room "
-          text run at (88,19) width 391: "for the big box to fit on the small box's line, in which case the "
-          text run at (479,19) width 290: "big box should be level with the bottom of the"
-          text run at (0,38) width 104: "respective small "
-          text run at (104,38) width 33: "box)."
-      RenderBlock {DIV} at (16,73) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
+          text run at (0,18) width 88: "enough room "
+          text run at (88,18) width 391: "for the big box to fit on the small box's line, in which case the "
+          text run at (479,18) width 290: "big box should be level with the bottom of the"
+          text run at (0,36) width 104: "respective small "
+          text run at (104,36) width 33: "box)."
+      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (133,21) size 474x19
           text run at (133,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 19x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-02-d-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-02-d-expected.txt
index 2d4a736..185937b 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-02-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-02-d-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x547
-  RenderBlock {HTML} at (0,0) size 800x547
-    RenderBody {BODY} at (8,16) size 784x515
-      RenderBlock {P} at (0,0) size 784x57 [color=#000080]
-        RenderText {#text} at (0,0) size 778x57
+layer at (0,0) size 800x544
+  RenderBlock {HTML} at (0,0) size 800x544
+    RenderBody {BODY} at (8,16) size 784x512
+      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
+        RenderText {#text} at (0,0) size 778x55
           text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
           text run at (408,0) width 329: "coloured boxes of the same color (unless there is not"
-          text run at (0,19) width 88: "enough room "
-          text run at (88,19) width 398: "for the big box to fit on the small box's line after the small box, "
-          text run at (486,19) width 292: "in which case the big box should be as high as"
-          text run at (0,38) width 121: "possible below the "
-          text run at (121,38) width 70: "small box)."
-      RenderBlock {DIV} at (16,73) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)]
+          text run at (0,18) width 88: "enough room "
+          text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, "
+          text run at (486,18) width 292: "in which case the big box should be as high as"
+          text run at (0,36) width 121: "possible below the "
+          text run at (121,36) width 70: "small box)."
+      RenderBlock {DIV} at (16,70) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (21,21) size 553x19
           text run at (21,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (495,21) width 79: "dummy text "
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-03-d-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-03-d-expected.txt
index e902597..4085d31 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-03-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-ln-03-d-expected.txt
@@ -1,18 +1,18 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x467
-  RenderBlock {HTML} at (0,0) size 800x467
-    RenderBody {BODY} at (8,16) size 784x435
-      RenderBlock {P} at (0,0) size 784x57 [color=#000080]
-        RenderText {#text} at (0,0) size 778x57
+layer at (0,0) size 800x464
+  RenderBlock {HTML} at (0,0) size 800x464
+    RenderBody {BODY} at (8,16) size 784x432
+      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
+        RenderText {#text} at (0,0) size 778x55
           text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
           text run at (408,0) width 329: "coloured boxes of the same color (unless there is not"
-          text run at (0,19) width 88: "enough room "
-          text run at (88,19) width 398: "for the big box to fit on the small box's line after the small box, "
-          text run at (486,19) width 292: "in which case the big box should be as high as"
-          text run at (0,38) width 121: "possible below the "
-          text run at (121,38) width 70: "small box)."
-      RenderBlock {DIV} at (16,73) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)]
+          text run at (0,18) width 88: "enough room "
+          text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, "
+          text run at (486,18) width 292: "in which case the big box should be as high as"
+          text run at (0,36) width 121: "possible below the "
+          text run at (121,36) width 70: "small box)."
+      RenderBlock {DIV} at (16,70) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (171,21) size 316x19
           text run at (171,21) width 316: "dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 18x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
index d28433a..5d0e3e7 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
@@ -1,45 +1,45 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x298
-  RenderBlock {HTML} at (0,0) size 800x298
-    RenderBody {BODY} at (8,16) size 784x266
-      RenderBlock {P} at (0,0) size 784x266 [color=#000080]
+layer at (0,0) size 800x284
+  RenderBlock {HTML} at (0,0) size 800x284
+    RenderBody {BODY} at (8,16) size 784x252
+      RenderBlock {P} at (0,0) size 784x252 [color=#000080]
         RenderImage {IMG} at (0,0) size 50x50
         RenderText {#text} at (50,0) size 325x19
           text run at (50,0) width 325: "\x{21E6} This text should flow around the box on the left. "
-        RenderInline {SPAN} at (0,0) size 766x266 [color=#C0C0C0]
-          RenderText {#text} at (375,0) size 766x266
+        RenderInline {SPAN} at (0,0) size 766x253 [color=#C0C0C0]
+          RenderText {#text} at (375,0) size 766x253
             text run at (375,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (50,19) width 52: "dummy "
-            text run at (102,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (576,19) width 181: "text dummy text dummy text"
-            text run at (50,38) width 289: "dummy text dummy text dummy text dummy "
-            text run at (339,38) width 418: "text dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,57) width 52: "dummy "
-            text run at (52,57) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,57) width 233: "text dummy text dummy text dummy"
-            text run at (0,76) width 237: "text dummy text dummy text dummy "
-            text run at (237,76) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (711,76) width 23: "text"
-            text run at (0,95) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (447,95) width 312: "text dummy text dummy text dummy text dummy"
-            text run at (0,114) width 158: "text dummy text dummy "
-            text run at (158,114) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (632,114) width 102: "text dummy text"
-            text run at (0,133) width 368: "dummy text dummy text dummy text dummy text dummy "
-            text run at (368,133) width 391: "text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,152) width 79: "text dummy "
-            text run at (79,152) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (553,152) width 181: "text dummy text dummy text"
-            text run at (0,171) width 289: "dummy text dummy text dummy text dummy "
-            text run at (289,171) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,190) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (474,190) width 260: "text dummy text dummy text dummy text"
-            text run at (0,209) width 210: "dummy text dummy text dummy "
-            text run at (210,209) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (684,209) width 75: "text dummy"
-            text run at (0,228) width 395: "text dummy text dummy text dummy text dummy text dummy "
-            text run at (395,228) width 339: "text dummy text dummy text dummy text dummy text"
-            text run at (0,247) width 131: "dummy text dummy "
-            text run at (131,247) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (50,18) width 52: "dummy "
+            text run at (102,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (576,18) width 181: "text dummy text dummy text"
+            text run at (50,36) width 289: "dummy text dummy text dummy text dummy "
+            text run at (339,36) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,54) width 52: "dummy "
+            text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,54) width 233: "text dummy text dummy text dummy"
+            text run at (0,72) width 237: "text dummy text dummy text dummy "
+            text run at (237,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (711,72) width 23: "text"
+            text run at (0,90) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (447,90) width 312: "text dummy text dummy text dummy text dummy"
+            text run at (0,108) width 158: "text dummy text dummy "
+            text run at (158,108) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (632,108) width 102: "text dummy text"
+            text run at (0,126) width 368: "dummy text dummy text dummy text dummy text dummy "
+            text run at (368,126) width 391: "text dummy text dummy text dummy text dummy text dummy"
+            text run at (0,144) width 79: "text dummy "
+            text run at (79,144) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (553,144) width 181: "text dummy text dummy text"
+            text run at (0,162) width 289: "dummy text dummy text dummy text dummy "
+            text run at (289,162) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy"
+            text run at (0,180) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (474,180) width 260: "text dummy text dummy text dummy text"
+            text run at (0,198) width 210: "dummy text dummy text dummy "
+            text run at (210,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (684,198) width 75: "text dummy"
+            text run at (0,216) width 395: "text dummy text dummy text dummy text dummy text dummy "
+            text run at (395,216) width 339: "text dummy text dummy text dummy text dummy text"
+            text run at (0,234) width 131: "dummy text dummy "
+            text run at (131,234) width 418: "text dummy text dummy text dummy text dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
index 0ac762e..24b02a5 100644
--- a/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
@@ -1,45 +1,45 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x298
-  RenderBlock {HTML} at (0,0) size 800x298
-    RenderBody {BODY} at (8,16) size 784x266
-      RenderBlock {P} at (0,0) size 784x266 [color=#000080]
+layer at (0,0) size 800x284
+  RenderBlock {HTML} at (0,0) size 800x284
+    RenderBody {BODY} at (8,16) size 784x252
+      RenderBlock {P} at (0,0) size 784x252 [color=#000080]
         RenderImage {IMG} at (734,0) size 50x50
         RenderText {#text} at (0,0) size 334x19
           text run at (0,0) width 334: "This text should flow around the box on the right. \x{21E8} "
-        RenderInline {SPAN} at (0,0) size 759x266 [color=#C0C0C0]
-          RenderText {#text} at (334,0) size 759x266
+        RenderInline {SPAN} at (0,0) size 759x253 [color=#C0C0C0]
+          RenderText {#text} at (334,0) size 759x253
             text run at (334,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,19) width 52: "dummy "
-            text run at (52,19) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,19) width 181: "text dummy text dummy text"
-            text run at (0,38) width 289: "dummy text dummy text dummy text dummy "
-            text run at (289,38) width 418: "text dummy text dummy text dummy text dummy text dummy text"
-            text run at (0,57) width 52: "dummy "
-            text run at (52,57) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (526,57) width 233: "text dummy text dummy text dummy"
-            text run at (0,76) width 237: "text dummy text dummy text dummy "
-            text run at (237,76) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (711,76) width 23: "text"
-            text run at (0,95) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (447,95) width 312: "text dummy text dummy text dummy text dummy"
-            text run at (0,114) width 158: "text dummy text dummy "
-            text run at (158,114) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (632,114) width 102: "text dummy text"
-            text run at (0,133) width 368: "dummy text dummy text dummy text dummy text dummy "
-            text run at (368,133) width 391: "text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,152) width 79: "text dummy "
-            text run at (79,152) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (553,152) width 181: "text dummy text dummy text"
-            text run at (0,171) width 289: "dummy text dummy text dummy text dummy "
-            text run at (289,171) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,190) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (474,190) width 260: "text dummy text dummy text dummy text"
-            text run at (0,209) width 210: "dummy text dummy text dummy "
-            text run at (210,209) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (684,209) width 75: "text dummy"
-            text run at (0,228) width 395: "text dummy text dummy text dummy text dummy text dummy "
-            text run at (395,228) width 339: "text dummy text dummy text dummy text dummy text"
-            text run at (0,247) width 131: "dummy text dummy "
-            text run at (131,247) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,18) width 52: "dummy "
+            text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,18) width 181: "text dummy text dummy text"
+            text run at (0,36) width 289: "dummy text dummy text dummy text dummy "
+            text run at (289,36) width 418: "text dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,54) width 52: "dummy "
+            text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,54) width 233: "text dummy text dummy text dummy"
+            text run at (0,72) width 237: "text dummy text dummy text dummy "
+            text run at (237,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (711,72) width 23: "text"
+            text run at (0,90) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (447,90) width 312: "text dummy text dummy text dummy text dummy"
+            text run at (0,108) width 158: "text dummy text dummy "
+            text run at (158,108) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (632,108) width 102: "text dummy text"
+            text run at (0,126) width 368: "dummy text dummy text dummy text dummy text dummy "
+            text run at (368,126) width 391: "text dummy text dummy text dummy text dummy text dummy"
+            text run at (0,144) width 79: "text dummy "
+            text run at (79,144) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (553,144) width 181: "text dummy text dummy text"
+            text run at (0,162) width 289: "dummy text dummy text dummy text dummy "
+            text run at (289,162) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy"
+            text run at (0,180) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (474,180) width 260: "text dummy text dummy text dummy text"
+            text run at (0,198) width 210: "dummy text dummy text dummy "
+            text run at (210,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (684,198) width 75: "text dummy"
+            text run at (0,216) width 395: "text dummy text dummy text dummy text dummy text dummy "
+            text run at (395,216) width 339: "text dummy text dummy text dummy text dummy text"
+            text run at (0,234) width 131: "dummy text dummy "
+            text run at (131,234) width 418: "text dummy text dummy text dummy text dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-00-b-g-expected.txt
index deb25ae..3ff3a9d 100644
--- a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-00-b-g-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x154
-  RenderBlock {HTML} at (0,0) size 800x154
-    RenderBody {BODY} at (8,16) size 784x130
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x153
+  RenderBlock {HTML} at (0,0) size 800x153
+    RenderBody {BODY} at (8,16) size 784x129
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 403x19
           text run at (0,0) width 403: "The square below should be exactly 50 pixels wide on the ruler."
-      RenderBlock {DIV} at (0,35) size 784x95
+      RenderBlock {DIV} at (0,34) size 784x95
         RenderImage {IMG} at (0,0) size 50x50
diff --git a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-01-b-g-expected.txt
index 3b97cc5..49ec412 100644
--- a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-01-b-g-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x495
-  RenderBlock {HTML} at (0,0) size 800x495
-    RenderBody {BODY} at (8,16) size 784x471
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x493
+  RenderBlock {HTML} at (0,0) size 800x493
+    RenderBody {BODY} at (8,16) size 784x469
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 461x19
           text run at (0,0) width 461: "The square below should be exactly 50% wide on the ruler at the bottom."
-      RenderBlock {DIV} at (0,35) size 784x396
+      RenderBlock {DIV} at (0,34) size 784x395
         RenderImage {IMG} at (0,0) size 392x392
diff --git a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-02-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-02-b-g-expected.txt
index f00eaa3..7fdb3d8 100644
--- a/LayoutTests/platform/efl/css2.1/t1002-c5523-width-02-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1002-c5523-width-02-b-g-expected.txt
@@ -1,64 +1,64 @@
-layer at (0,0) size 785x631
+layer at (0,0) size 785x602
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x631
-  RenderBlock {HTML} at (0,0) size 785x631
-    RenderBody {BODY} at (8,16) size 769x607
-      RenderBlock {P} at (0,0) size 769x19
+layer at (0,0) size 785x602
+  RenderBlock {HTML} at (0,0) size 785x602
+    RenderBody {BODY} at (8,16) size 769x578
+      RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 417x19
           text run at (0,0) width 374: "The blue text should not go past the 50% mark on the ruler "
           text run at (374,0) width 43: "below."
-      RenderBlock {DIV} at (0,35) size 384x532 [color=#0000FF]
-        RenderText {#text} at (0,0) size 377x532
+      RenderBlock {DIV} at (0,34) size 384x504 [color=#0000FF]
+        RenderText {#text} at (0,0) size 377x505
           text run at (0,0) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,19) width 11: "a "
-          text run at (11,19) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,38) width 48: "a bit of "
-          text run at (48,38) width 329: "dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,57) width 100: "a bit of dummy "
-          text run at (100,57) width 277: "text a bit of dummy text a bit of dummy text"
-          text run at (0,76) width 138: "a bit of dummy text a "
-          text run at (138,76) width 239: "bit of dummy text a bit of dummy text"
-          text run at (0,95) width 175: "a bit of dummy text a bit of "
-          text run at (175,95) width 202: "dummy text a bit of dummy text"
-          text run at (0,114) width 227: "a bit of dummy text a bit of dummy "
-          text run at (227,114) width 150: "text a bit of dummy text"
-          text run at (0,133) width 265: "a bit of dummy text a bit of dummy text a "
-          text run at (265,133) width 112: "bit of dummy text"
-          text run at (0,152) width 302: "a bit of dummy text a bit of dummy text a bit of "
-          text run at (302,152) width 75: "dummy text"
-          text run at (0,171) width 354: "a bit of dummy text a bit of dummy text a bit of dummy "
-          text run at (354,171) width 23: "text"
-          text run at (0,190) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,209) width 11: "a "
-          text run at (11,209) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,228) width 48: "a bit of "
-          text run at (48,228) width 329: "dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,247) width 100: "a bit of dummy "
-          text run at (100,247) width 277: "text a bit of dummy text a bit of dummy text"
-          text run at (0,266) width 138: "a bit of dummy text a "
-          text run at (138,266) width 239: "bit of dummy text a bit of dummy text"
-          text run at (0,285) width 175: "a bit of dummy text a bit of "
-          text run at (175,285) width 202: "dummy text a bit of dummy text"
-          text run at (0,304) width 227: "a bit of dummy text a bit of dummy "
-          text run at (227,304) width 150: "text a bit of dummy text"
-          text run at (0,323) width 265: "a bit of dummy text a bit of dummy text a "
-          text run at (265,323) width 112: "bit of dummy text"
-          text run at (0,342) width 302: "a bit of dummy text a bit of dummy text a bit of "
-          text run at (302,342) width 75: "dummy text"
-          text run at (0,361) width 354: "a bit of dummy text a bit of dummy text a bit of dummy "
-          text run at (354,361) width 23: "text"
-          text run at (0,380) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,399) width 11: "a "
-          text run at (11,399) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,418) width 48: "a bit of "
-          text run at (48,418) width 329: "dummy text a bit of dummy text a bit of dummy text"
-          text run at (0,437) width 100: "a bit of dummy "
-          text run at (100,437) width 277: "text a bit of dummy text a bit of dummy text"
-          text run at (0,456) width 138: "a bit of dummy text a "
-          text run at (138,456) width 239: "bit of dummy text a bit of dummy text"
-          text run at (0,475) width 175: "a bit of dummy text a bit of "
-          text run at (175,475) width 202: "dummy text a bit of dummy text"
-          text run at (0,494) width 227: "a bit of dummy text a bit of dummy "
-          text run at (227,494) width 150: "text a bit of dummy text"
-          text run at (0,513) width 227: "a bit of dummy text a bit of dummy "
-          text run at (227,513) width 23: "text"
+          text run at (0,18) width 11: "a "
+          text run at (11,18) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,36) width 48: "a bit of "
+          text run at (48,36) width 329: "dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,54) width 100: "a bit of dummy "
+          text run at (100,54) width 277: "text a bit of dummy text a bit of dummy text"
+          text run at (0,72) width 138: "a bit of dummy text a "
+          text run at (138,72) width 239: "bit of dummy text a bit of dummy text"
+          text run at (0,90) width 175: "a bit of dummy text a bit of "
+          text run at (175,90) width 202: "dummy text a bit of dummy text"
+          text run at (0,108) width 227: "a bit of dummy text a bit of dummy "
+          text run at (227,108) width 150: "text a bit of dummy text"
+          text run at (0,126) width 265: "a bit of dummy text a bit of dummy text a "
+          text run at (265,126) width 112: "bit of dummy text"
+          text run at (0,144) width 302: "a bit of dummy text a bit of dummy text a bit of "
+          text run at (302,144) width 75: "dummy text"
+          text run at (0,162) width 354: "a bit of dummy text a bit of dummy text a bit of dummy "
+          text run at (354,162) width 23: "text"
+          text run at (0,180) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,198) width 11: "a "
+          text run at (11,198) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,216) width 48: "a bit of "
+          text run at (48,216) width 329: "dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,234) width 100: "a bit of dummy "
+          text run at (100,234) width 277: "text a bit of dummy text a bit of dummy text"
+          text run at (0,252) width 138: "a bit of dummy text a "
+          text run at (138,252) width 239: "bit of dummy text a bit of dummy text"
+          text run at (0,270) width 175: "a bit of dummy text a bit of "
+          text run at (175,270) width 202: "dummy text a bit of dummy text"
+          text run at (0,288) width 227: "a bit of dummy text a bit of dummy "
+          text run at (227,288) width 150: "text a bit of dummy text"
+          text run at (0,306) width 265: "a bit of dummy text a bit of dummy text a "
+          text run at (265,306) width 112: "bit of dummy text"
+          text run at (0,324) width 302: "a bit of dummy text a bit of dummy text a bit of "
+          text run at (302,324) width 75: "dummy text"
+          text run at (0,342) width 354: "a bit of dummy text a bit of dummy text a bit of dummy "
+          text run at (354,342) width 23: "text"
+          text run at (0,360) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,378) width 11: "a "
+          text run at (11,378) width 366: "bit of dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,396) width 48: "a bit of "
+          text run at (48,396) width 329: "dummy text a bit of dummy text a bit of dummy text"
+          text run at (0,414) width 100: "a bit of dummy "
+          text run at (100,414) width 277: "text a bit of dummy text a bit of dummy text"
+          text run at (0,432) width 138: "a bit of dummy text a "
+          text run at (138,432) width 239: "bit of dummy text a bit of dummy text"
+          text run at (0,450) width 175: "a bit of dummy text a bit of "
+          text run at (175,450) width 202: "dummy text a bit of dummy text"
+          text run at (0,468) width 227: "a bit of dummy text a bit of dummy "
+          text run at (227,468) width 150: "text a bit of dummy text"
+          text run at (0,486) width 227: "a bit of dummy text a bit of dummy "
+          text run at (227,486) width 23: "text"
diff --git a/LayoutTests/platform/efl/css2.1/t100303-c412-blockw-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100303-c412-blockw-00-d-ag-expected.txt
index 7e571d1..6fd03a9 100644
--- a/LayoutTests/platform/efl/css2.1/t100303-c412-blockw-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100303-c412-blockw-00-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x311
-  RenderBlock {HTML} at (0,0) size 800x311
-    RenderBody {BODY} at (8,16) size 784x285
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x310
+  RenderBlock {HTML} at (0,0) size 800x310
+    RenderBody {BODY} at (8,16) size 784x284
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 341x19
           text run at (0,0) width 341: "There should be no red below, just two green squares."
-      RenderBlock {DIV} at (10,35) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)]
+      RenderBlock {DIV} at (10,34) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)]
         RenderBlock {P} at (20,10) size 90x10
           RenderText {#text} at (0,0) size 10x10
             text run at (0,0) width 10: "X"
@@ -38,7 +38,7 @@
         RenderBlock {P} at (10,100) size 100x10
           RenderText {#text} at (0,0) size 10x10
             text run at (0,0) width 10: "X"
-      RenderBlock {DIV} at (10,165) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)]
+      RenderBlock {DIV} at (10,164) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)]
         RenderBlock {P} at (20,10) size 90x10 [bgcolor=#008000]
           RenderText {#text} at (0,0) size 10x10
             text run at (0,0) width 10: "X"
diff --git a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt
index 336a0d3..e82003a 100644
--- a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x459
-  RenderBlock {HTML} at (0,0) size 800x459
-    RenderBody {BODY} at (8,16) size 784x427
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x458
+  RenderBlock {HTML} at (0,0) size 800x458
+    RenderBody {BODY} at (8,16) size 784x426
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 616x19
           text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the "
           text run at (396,0) width 220: "width of the window and centered."
-      RenderBlock {P} at (0,35) size 784x392 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x392 [color=#000080]
         RenderImage {IMG} at (196,0) size 392x392
diff --git a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
index c7bad25..a523351 100644
--- a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x478
-  RenderBlock {HTML} at (0,0) size 800x478
-    RenderBody {BODY} at (8,16) size 784x446
-      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
-        RenderText {#text} at (0,0) size 769x38
+layer at (0,0) size 800x476
+  RenderBlock {HTML} at (0,0) size 800x476
+    RenderBody {BODY} at (8,16) size 784x444
+      RenderBlock {P} at (0,0) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 769x37
           text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the "
           text run at (396,0) width 373: "width of the window, aligned flush with the right hand side"
-          text run at (0,19) width 27: "(\x{21E8})."
-      RenderBlock {P} at (0,54) size 784x392 [color=#000080]
+          text run at (0,18) width 27: "(\x{21E8})."
+      RenderBlock {P} at (0,52) size 784x392 [color=#000080]
         RenderImage {IMG} at (392,0) size 392x392
diff --git a/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt
index a799a3e..5f9f225 100644
--- a/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x321
-  RenderBlock {HTML} at (0,0) size 800x321
-    RenderBody {BODY} at (8,16) size 784x289
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,16) size 784x286
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "There should be no red anywhere."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 327x19
           text run at (0,0) width 327: "There should be two identical squares after this line:"
-      RenderBlock {DIV} at (16,70) size 752x35
+      RenderBlock {DIV} at (16,68) size 752x35
         RenderImage {IMG} at (0,0) size 15x15
         RenderBlock {SPAN} at (0,20) size 15x15 [color=#0000FF] [bgcolor=#FF0000]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "X"
-      RenderBlock {P} at (0,121) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,119) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 327x19
           text run at (0,0) width 327: "There should be two identical squares after this line:"
-      RenderBlock {DIV} at (16,156) size 752x133
+      RenderBlock {DIV} at (16,153) size 752x133
         RenderImage {IMG} at (0,0) size 64x64
         RenderBlock {SPAN} at (0,69) size 64x64 [color=#0000FF] [bgcolor=#FF0000]
           RenderText {#text} at (0,0) size 64x65
diff --git a/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt
index ee6cd4b..01af739 100644
--- a/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x170
-  RenderBlock {HTML} at (0,0) size 800x170
-    RenderBody {BODY} at (8,16) size 784x138
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x167
+  RenderBlock {HTML} at (0,0) size 800x167
+    RenderBody {BODY} at (8,16) size 784x135
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "There should be no red anywhere."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 381x19
           text run at (0,0) width 381: "There should be two identical squares at the end of this line: "
         RenderImage {IMG} at (381,0) size 15x15
@@ -16,7 +16,7 @@
           RenderText {#text} at (400,0) size 15x15
             text run at (400,0) width 15: "X"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,70) size 784x68 [color=#000080]
+      RenderBlock {P} at (0,68) size 784x67 [color=#000080]
         RenderText {#text} at (0,49) size 381x19
           text run at (0,49) width 381: "There should be two identical squares at the end of this line: "
         RenderImage {IMG} at (381,0) size 64x64
diff --git a/LayoutTests/platform/efl/css2.1/t1004-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1004-c5524-width-00-b-g-expected.txt
index 9aaeff7..66b1435 100644
--- a/LayoutTests/platform/efl/css2.1/t1004-c5524-width-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1004-c5524-width-00-b-g-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x562
-  RenderBlock {HTML} at (0,0) size 800x562
-    RenderBody {BODY} at (8,16) size 784x538
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 770x38
+layer at (0,0) size 800x559
+  RenderBlock {HTML} at (0,0) size 800x559
+    RenderBody {BODY} at (8,16) size 784x535
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 770x37
           text run at (0,0) width 395: "The blue rectangle below should be exactly 200 pixels by 120 "
           text run at (395,0) width 375: "pixels on the ruler (and the aqua bars should stick out of the"
-          text run at (0,19) width 193: "blue box, with no red present)."
-      RenderBlock {DIV} at (0,54) size 784x484
+          text run at (0,18) width 193: "blue box, with no red present)."
+      RenderBlock {DIV} at (0,52) size 784x483
         RenderImage {IMG} at (40,40) size 120x200
diff --git a/LayoutTests/platform/efl/css2.1/t1005-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1005-c5524-width-00-b-g-expected.txt
index 3586ba4..ed9e7bff 100644
--- a/LayoutTests/platform/efl/css2.1/t1005-c5524-width-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1005-c5524-width-00-b-g-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x214
-  RenderBlock {HTML} at (0,0) size 800x214
-    RenderBody {BODY} at (8,16) size 784x190
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x213
+  RenderBlock {HTML} at (0,0) size 800x213
+    RenderBody {BODY} at (8,16) size 784x189
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 400x19
           text run at (0,0) width 400: "The square below should be exactly 50 pixels high on the ruler."
-      RenderBlock {DIV} at (0,35) size 784x155
+      RenderBlock {DIV} at (0,34) size 784x155
         RenderImage {IMG} at (45,0) size 50x50
diff --git a/LayoutTests/platform/efl/css2.1/t1005-c5524-width-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1005-c5524-width-01-b-g-expected.txt
index f54f38d..02a9bce 100644
--- a/LayoutTests/platform/efl/css2.1/t1005-c5524-width-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1005-c5524-width-01-b-g-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x264
-  RenderBlock {HTML} at (0,0) size 800x264
-    RenderBody {BODY} at (8,16) size 784x240
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x263
+  RenderBlock {HTML} at (0,0) size 800x263
+    RenderBody {BODY} at (8,16) size 784x239
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 408x19
           text run at (0,0) width 408: "The square below should be exactly 100 pixels high on the ruler."
-      RenderBlock {DIV} at (0,35) size 784x205
+      RenderBlock {DIV} at (0,34) size 784x205
         RenderImage {IMG} at (45,0) size 100x100
diff --git a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt
index 8108ba9..5e1eba3 100644
--- a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x219
-  RenderBlock {HTML} at (0,0) size 800x219
-    RenderBody {BODY} at (8,16) size 784x195
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x218
+  RenderBlock {HTML} at (0,0) size 800x218
+    RenderBody {BODY} at (8,16) size 784x194
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box."
-      RenderBlock {DIV} at (0,35) size 230x160 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)]
+      RenderBlock {DIV} at (0,34) size 230x160 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)]
         RenderText {#text} at (20,20) size 190x30
           text run at (20,20) width 190: "xxxx xxxx xxxx xxxx"
           text run at (20,40) width 190: "xxxx xxxx xxxx xxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt
index 5d099aa..5fedfe1 100644
--- a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x299
-  RenderBlock {HTML} at (0,0) size 800x299
-    RenderBody {BODY} at (8,16) size 784x275
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x298
+  RenderBlock {HTML} at (0,0) size 800x298
+    RenderBody {BODY} at (8,16) size 784x274
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box."
-      RenderBlock {DIV} at (0,35) size 430x240 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)]
+      RenderBlock {DIV} at (0,34) size 430x240 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)]
         RenderText {#text} at (20,20) size 390x105
           text run at (20,20) width 390: "xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx"
           text run at (20,115) width 50: "xxxx "
diff --git a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt
index 22d5d1a..5c32cae 100644
--- a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x323
-  RenderBlock {HTML} at (0,0) size 800x323
-    RenderBody {BODY} at (8,16) size 784x299
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x322
+  RenderBlock {HTML} at (0,0) size 800x322
+    RenderBody {BODY} at (8,16) size 784x298
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box."
-      RenderBlock {DIV} at (0,35) size 360x264 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)]
+      RenderBlock {DIV} at (0,34) size 360x264 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)]
         RenderText {#text} at (40,40) size 280x104
           text run at (40,40) width 280: "xxxx xxxx xxxx"
           text run at (40,80) width 280: "xxxx xxxx xxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt
index 7c028ab..35a438f 100644
--- a/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x319
-  RenderBlock {HTML} at (0,0) size 800x319
-    RenderBody {BODY} at (8,16) size 784x295
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x318
+  RenderBlock {HTML} at (0,0) size 800x318
+    RenderBody {BODY} at (8,16) size 784x294
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 439x19
           text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box."
-      RenderBlock {DIV} at (0,35) size 360x260 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)]
+      RenderBlock {DIV} at (0,34) size 360x260 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)]
         RenderText {#text} at (40,40) size 280x100
           text run at (40,40) width 280: "xxxx xxxx xxxx"
           text run at (40,80) width 280: "xxxx xxxx xxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt
index f93effd..74f8615 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x119
-  RenderBlock {HTML} at (0,0) size 800x119
-    RenderBody {BODY} at (8,16) size 784x95
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x94
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 358x19
           text run at (0,0) width 358: "There should be no red below, only green lines and dots."
-      RenderBlock {DIV} at (0,35) size 200x60 [color=#008000]
+      RenderBlock {DIV} at (0,34) size 200x60 [color=#008000]
         RenderText {#text} at (0,1) size 40x10
           text run at (0,1) width 40: "z z "
         RenderInline {EM} at (0,0) size 190x22 [color=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-00-a-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-00-a-ag-expected.txt
index 4920e9c..37d5f87 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-00-a-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-00-a-ag-expected.txt
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x256
-  RenderBlock {HTML} at (0,0) size 800x256
-    RenderBody {BODY} at (8,16) size 784x190
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 755x38
+layer at (0,0) size 800x254
+  RenderBlock {HTML} at (0,0) size 800x254
+    RenderBody {BODY} at (8,16) size 784x188
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 755x37
           text run at (0,0) width 755: "There should be four identical white boxes in the teal block below, all the same size, each one a little lower down on the"
-          text run at (0,19) width 134: "line, in a step pattern."
-      RenderBlock {DIV} at (50,88) size 684x102 [color=#FFFFFF] [bgcolor=#008080]
+          text run at (0,18) width 134: "line, in a step pattern."
+      RenderBlock {DIV} at (50,86) size 684x102 [color=#FFFFFF] [bgcolor=#008080]
         RenderInline {SPAN} at (0,0) size 50x50
           RenderText {#text} at (12,12) size 50x50
             text run at (12,12) width 50: "X"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-01-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-01-d-ag-expected.txt
index 03aaaa4d..a6a3aa5 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-01-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-01-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x299
-  RenderBlock {HTML} at (0,0) size 800x299
-    RenderBody {BODY} at (8,16) size 784x275
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x298
+  RenderBlock {HTML} at (0,0) size 800x298
+    RenderBody {BODY} at (8,16) size 784x274
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 314x19
           text run at (0,0) width 314: "There should be a green block with no red below."
-      RenderBlock {DIV} at (15,35) size 90x240 [color=#008000] [bgcolor=#FF0000]
+      RenderBlock {DIV} at (15,34) size 90x240 [color=#008000] [bgcolor=#FF0000]
         RenderBlock {DIV} at (0,0) size 90x33
           RenderImage {IMG} at (0,0) size 30x30
           RenderInline {SPAN} at (0,0) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-02-d-agi-expected.txt
index 219b53a..4facf49 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-02-d-agi-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-02-d-agi-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x358
-  RenderBlock {HTML} at (0,0) size 800x358
-    RenderBody {BODY} at (8,16) size 784x327
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 727x38
+layer at (0,0) size 800x356
+  RenderBlock {HTML} at (0,0) size 800x356
+    RenderBody {BODY} at (8,16) size 784x325
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 727x37
           text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue "
           text run at (387,0) width 340: "rectanglues should always have their tops on the same"
-          text run at (0,19) width 83: "alignment as "
-          text run at (83,19) width 204: "other blue rectangles on the line."
-      RenderBlock {P} at (15,54) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
+          text run at (0,18) width 83: "alignment as "
+          text run at (83,18) width 204: "other blue rectangles on the line."
+      RenderBlock {P} at (15,52) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
         RenderText {#text} at (8,27) size 60x15
           text run at (8,27) width 60: "xxx "
         RenderImage {IMG} at (68,27) size 30x30
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-03-d-agi-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
index 31b88ba..b943979 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x319
-  RenderBlock {HTML} at (0,0) size 800x319
-    RenderBody {BODY} at (8,16) size 784x288
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 750x38
+layer at (0,0) size 800x317
+  RenderBlock {HTML} at (0,0) size 800x317
+    RenderBody {BODY} at (8,16) size 784x286
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 750x37
           text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue "
           text run at (387,0) width 363: "rectanglues should always have their middles on the same"
-          text run at (0,19) width 83: "alignment as "
-          text run at (83,19) width 204: "other blue rectangles on the line."
-      RenderBlock {P} at (15,54) size 754x234 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
+          text run at (0,18) width 83: "alignment as "
+          text run at (83,18) width 204: "other blue rectangles on the line."
+      RenderBlock {P} at (15,52) size 754x234 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
         RenderText {#text} at (8,35) size 60x15
           text run at (8,35) width 60: "\x{C9}\x{C9}\x{C9} "
         RenderImage {IMG} at (68,25) size 30x30
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-04-d-agi-expected.txt
index bb4e913..b8c3dfc 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-04-d-agi-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c544-valgn-04-d-agi-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x256
-  RenderBlock {HTML} at (0,0) size 800x256
-    RenderBody {BODY} at (8,16) size 784x225
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 727x38
+layer at (0,0) size 800x254
+  RenderBlock {HTML} at (0,0) size 800x254
+    RenderBody {BODY} at (8,16) size 784x223
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 727x37
           text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue "
           text run at (387,0) width 340: "rectanglues should always have their tops on the same"
-          text run at (0,19) width 83: "alignment as "
-          text run at (83,19) width 204: "other blue rectangles on the line."
-      RenderBlock {P} at (15,54) size 754x171 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
+          text run at (0,18) width 83: "alignment as "
+          text run at (83,18) width 204: "other blue rectangles on the line."
+      RenderBlock {P} at (15,52) size 754x171 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
         RenderInline {SPAN} at (0,0) size 45x15
           RenderText {#text} at (8,8) size 45x15
             text run at (8,8) width 45: "xxx"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-leadin-00-d-a-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-leadin-00-d-a-expected.txt
index b302046..61f7727 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-leadin-00-d-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-leadin-00-d-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x165
-  RenderBlock {HTML} at (0,0) size 800x165
-    RenderBody {BODY} at (8,16) size 784x141
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x164
+  RenderBlock {HTML} at (0,0) size 800x164
+    RenderBody {BODY} at (8,16) size 784x140
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 459x19
           text run at (0,0) width 459: "There should be stripes of dark green and light green below, with no red."
-      RenderBlock {DIV} at (0,35) size 81x106 [color=#00FF00] [bgcolor=#008000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 81x106 [color=#00FF00] [bgcolor=#008000] [border: (3px solid #000000)]
         RenderInline {SPAN} at (0,0) size 75x75 [bgcolor=#FF0000]
           RenderText {#text} at (3,15) size 75x75
             text run at (3,15) width 75: "xxx"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt
index 1d370e9..420bb75 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x327
-  RenderBlock {HTML} at (0,0) size 800x327
-    RenderBody {BODY} at (8,16) size 784x299
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x326
+  RenderBlock {HTML} at (0,0) size 800x326
+    RenderBody {BODY} at (8,16) size 784x298
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 267x19
           text run at (0,0) width 267: "The two blocks below should be identical:"
-      RenderBlock {DIV} at (12,35) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)]
+      RenderBlock {DIV} at (12,34) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)]
         RenderText {#text} at (27,26) size 72x73
           text run at (27,26) width 72: "X X"
           text run at (27,74) width 72: "X X"
-      RenderBlock {PRE} at (12,173) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)]
+      RenderBlock {PRE} at (12,172) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 120x121
           text run at (3,3) width 120: "     "
           text run at (123,3) width 0: " "
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt
index fb7d165..d020b28 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (8,8) size 784x331
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x346
+  RenderBlock {HTML} at (0,0) size 800x346
+    RenderBody {BODY} at (8,8) size 784x330
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 504x19
           text run at (0,0) width 504: "There should be a big pattern of green and lime dots below, with no red present."
-      RenderBlock {DIV} at (6,25) size 66x306 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (6,24) size 66x306 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {P} at (15,9) size 48x48
           RenderText {#text} at (0,5) size 36x37
             text run at (0,5) width 36: "X X"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt
index 986512f..ea23534 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x315
-  RenderBlock {HTML} at (0,0) size 800x315
-    RenderBody {BODY} at (8,8) size 784x299
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x314
+  RenderBlock {HTML} at (0,0) size 800x314
+    RenderBody {BODY} at (8,8) size 784x298
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 504x19
           text run at (0,0) width 504: "There should be a big pattern of green and lime dots below, with no red present."
-      RenderBlock {DIV} at (6,25) size 66x274 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (6,24) size 66x274 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {P} at (15,9) size 48x48
           RenderText {#text} at (0,5) size 36x37
             text run at (0,5) width 36: "X X"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt
index 7cffc77..6081fe0 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x313
-  RenderBlock {HTML} at (0,0) size 800x313
-    RenderBody {BODY} at (8,8) size 784x285
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x312
+  RenderBlock {HTML} at (0,0) size 800x312
+    RenderBody {BODY} at (8,8) size 784x284
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "There should be no red below:"
-      RenderBlock {DIV} at (20,39) size 86x246 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (20,38) size 86x246 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock (anonymous) at (3,3) size 80x80
           RenderText {#text} at (0,10) size 60x60
             text run at (0,10) width 60: "x x"
diff --git a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt
index 320b281..250dd80 100644
--- a/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x393
-  RenderBlock {HTML} at (0,0) size 800x393
-    RenderBody {BODY} at (8,8) size 784x365
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x392
+  RenderBlock {HTML} at (0,0) size 800x392
+    RenderBody {BODY} at (8,8) size 784x364
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "There should be no red below:"
-      RenderBlock {DIV} at (20,39) size 86x326 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (20,38) size 86x326 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock (anonymous) at (3,3) size 80x80
           RenderText {#text} at (0,10) size 60x60
             text run at (0,10) width 60: "x x"
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-00-b-expected.txt
index b9938cf..a9dbd7e 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-00-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -78,7 +78,7 @@
             RenderCounter at (148,0) size 16x19
               text run at (148,0) width 16: "12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 12: "1 "
           text run at (12,0) width 12: "2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-01-b-expected.txt
index fdfe00f..fd40c1f 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-01-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 7x19
           RenderInline (generated) at (0,0) size 7x19
             RenderCounter at (0,0) size 0x0
@@ -95,7 +95,7 @@
             RenderText at (121,0) size 7x19
               text run at (121,0) width 7: "z"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 128x19
           text run at (0,0) width 11: "z "
           text run at (11,0) width 11: "z "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-02-b-expected.txt
index bd2087b..92792eb 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-02-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 6x19
           RenderInline (generated) at (0,0) size 6x19
             RenderCounter at (0,0) size 6x19
@@ -83,7 +83,7 @@
             RenderCounter at (110,0) size 6x19
               text run at (110,0) width 6: "\x{2022}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 116x19
           text run at (0,0) width 10: "\x{2022} "
           text run at (10,0) width 10: "\x{2022} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt
index 83eb2fc..7329c0d 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 6x19
           RenderInline (generated) at (0,0) size 6x19
             RenderCounter at (0,0) size 6x19
@@ -83,7 +83,7 @@
             RenderCounter at (110,0) size 6x19
               text run at (110,0) width 6: "\x{25E6}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 116x19
           text run at (0,0) width 10: "\x{25E6} "
           text run at (10,0) width 10: "\x{25E6} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-04-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-04-b-expected.txt
index 43b226e..e67fe4e 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-04-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-04-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 10x19
           RenderInline (generated) at (0,0) size 10x19
             RenderCounter at (0,0) size 10x19
@@ -83,7 +83,7 @@
             RenderCounter at (154,0) size 10x19
               text run at (154,0) width 10: "\x{25A0}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 188x19
           text run at (0,0) width 16: "\x{25FE} "
           text run at (16,0) width 16: "\x{25FE} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-05-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-05-b-expected.txt
index b9938cf..a9dbd7e 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-05-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-05-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -78,7 +78,7 @@
             RenderCounter at (148,0) size 16x19
               text run at (148,0) width 16: "12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 12: "1 "
           text run at (12,0) width 12: "2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-06-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-06-b-expected.txt
index 181751e..9722878 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-06-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-06-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 16x19
           RenderInline (generated) at (0,0) size 16x19
             RenderCounter at (0,0) size 16x19
@@ -96,7 +96,7 @@
             RenderCounter at (288,0) size 24x19
               text run at (288,0) width 24: "101"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 312x19
           text run at (0,0) width 20: "01 "
           text run at (20,0) width 20: "02 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-07-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-07-b-expected.txt
index 4afc3d2..ac48117 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-07-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-07-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 4x19
           RenderInline (generated) at (0,0) size 4x19
             RenderCounter at (0,0) size 4x19
@@ -120,7 +120,7 @@
             RenderCounter at (494,0) size 70x19
               text run at (494,0) width 70: "mmmcdxci"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 564x19
           text run at (0,0) width 8: "i "
           text run at (8,0) width 12: "ii "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-08-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-08-b-expected.txt
index 52216e0..847df06 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-08-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-08-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 5x19
           RenderInline (generated) at (0,0) size 5x19
             RenderCounter at (0,0) size 5x19
@@ -120,7 +120,7 @@
             RenderCounter at (682,0) size 93x19
               text run at (682,0) width 93: "MMMCDXCI"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 775x19
           text run at (0,0) width 9: "I "
           text run at (9,0) width 14: "II "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-09-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-09-b-expected.txt
index a4ad6a4..d38316f 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-09-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-09-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -246,7 +246,7 @@
             RenderCounter at (530,0) size 46x19
               text run at (530,0) width 46: "\x{10F5}\x{10F0}\x{10E8}\x{10DF}\x{10D7}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 576x19
           text run at (0,0) width 12: "\x{10D0} "
           text run at (12,0) width 12: "\x{10D1} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-11-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-11-b-expected.txt
index 793bac6..8b043ad 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-11-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-11-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 7x19
           RenderInline (generated) at (0,0) size 7x19
             RenderCounter at (0,0) size 7x19
@@ -78,7 +78,7 @@
             RenderCounter at (118,0) size 4x19
               text run at (118,0) width 4: "l"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 122x19
           text run at (0,0) width 11: "a "
           text run at (11,0) width 12: "b "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-12-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-12-b-expected.txt
index 793bac6..8b043ad 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-12-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-12-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 7x19
           RenderInline (generated) at (0,0) size 7x19
             RenderCounter at (0,0) size 7x19
@@ -78,7 +78,7 @@
             RenderCounter at (118,0) size 4x19
               text run at (118,0) width 4: "l"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 122x19
           text run at (0,0) width 11: "a "
           text run at (11,0) width 12: "b "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-13-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-13-b-expected.txt
index 0c2326c..8fd1149 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-13-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-13-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 12x19
           RenderInline (generated) at (0,0) size 12x19
             RenderCounter at (0,0) size 12x19
@@ -78,7 +78,7 @@
             RenderCounter at (156,0) size 10x19
               text run at (156,0) width 10: "L"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 166x19
           text run at (0,0) width 16: "A "
           text run at (16,0) width 15: "B "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-14-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-14-b-expected.txt
index 0c2326c..8fd1149 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-14-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-14-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 12x19
           RenderInline (generated) at (0,0) size 12x19
             RenderCounter at (0,0) size 12x19
@@ -78,7 +78,7 @@
             RenderCounter at (156,0) size 10x19
               text run at (156,0) width 10: "L"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 166x19
           text run at (0,0) width 16: "A "
           text run at (16,0) width 15: "B "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-15-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-15-b-expected.txt
index 0b37e9e..3149901 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-15-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-15-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -78,7 +78,7 @@
             RenderCounter at (125,0) size 9x19
               text run at (125,0) width 9: "\x{3BC}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 134x19
           text run at (0,0) width 12: "\x{3B1} "
           text run at (12,0) width 12: "\x{3B2} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counter-16-f-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counter-16-f-expected.txt
index b9938cf..a9dbd7e 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counter-16-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counter-16-f-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -78,7 +78,7 @@
             RenderCounter at (148,0) size 16x19
               text run at (148,0) width 16: "12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 12: "1 "
           text run at (12,0) width 12: "2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-00-b-expected.txt
index 816475dc..6fe13aa 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-00-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
@@ -78,7 +78,7 @@
             RenderCounter at (280,0) size 28x19
               text run at (280,0) width 28: "1.12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 308x19
           text run at (0,0) width 24: "1.1 "
           text run at (24,0) width 24: "1.2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-01-b-expected.txt
index 29cf494..e256050 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-01-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 11x19
           RenderInline (generated) at (0,0) size 11x19
             RenderCounter at (0,0) size 4x19
@@ -107,7 +107,7 @@
             RenderText at (169,0) size 7x19
               text run at (169,0) width 7: "z"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 176x19
           text run at (0,0) width 15: ".z "
           text run at (15,0) width 15: ".z "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-02-b-expected.txt
index a9a7541..b491c62 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-02-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 16x19
           RenderInline (generated) at (0,0) size 16x19
             RenderCounter at (0,0) size 16x19
@@ -83,7 +83,7 @@
             RenderCounter at (220,0) size 16x19
               text run at (220,0) width 16: "\x{2022}.\x{2022}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 236x19
           text run at (0,0) width 20: "\x{2022}.\x{2022} "
           text run at (20,0) width 20: "\x{2022}.\x{2022} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-03-b-expected.txt
index f99a85f..6d33da6 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-03-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 16x19
           RenderInline (generated) at (0,0) size 16x19
             RenderCounter at (0,0) size 16x19
@@ -83,7 +83,7 @@
             RenderCounter at (220,0) size 16x19
               text run at (220,0) width 16: "\x{25E6}.\x{25E6}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 236x19
           text run at (0,0) width 20: "\x{25E6}.\x{25E6} "
           text run at (20,0) width 20: "\x{25E6}.\x{25E6} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-04-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-04-b-expected.txt
index 19d6306..5b5ca3a 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-04-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-04-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 233x19
           text run at (0,0) width 233: "The following two lines should look "
         RenderInline {EM} at (0,0) size 91x19
@@ -11,7 +11,7 @@
             text run at (233,0) width 91: "approximately"
         RenderText {#text} at (324,0) size 63x19
           text run at (324,0) width 63: " the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 24x19
           RenderInline (generated) at (0,0) size 24x19
             RenderCounter at (0,0) size 24x19
@@ -83,7 +83,7 @@
             RenderCounter at (308,0) size 24x19
               text run at (308,0) width 24: "\x{25A0}.\x{25A0}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 380x19
           text run at (0,0) width 32: "\x{25FE}.\x{25FE} "
           text run at (32,0) width 32: "\x{25FE}.\x{25FE} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-05-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-05-b-expected.txt
index 816475dc..6fe13aa 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-05-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-05-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
@@ -78,7 +78,7 @@
             RenderCounter at (280,0) size 28x19
               text run at (280,0) width 28: "1.12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 308x19
           text run at (0,0) width 24: "1.1 "
           text run at (24,0) width 24: "1.2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-06-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-06-b-expected.txt
index ca44b38..07d2b13 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-06-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-06-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 36x19
           RenderInline (generated) at (0,0) size 36x19
             RenderCounter at (0,0) size 36x19
@@ -96,7 +96,7 @@
             RenderCounter at (568,0) size 44x19
               text run at (568,0) width 44: "01.101"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 612x19
           text run at (0,0) width 40: "01.01 "
           text run at (40,0) width 40: "01.02 "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-07-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-07-b-expected.txt
index 40f8b74..1a7d79f 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-07-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-07-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 12x19
           RenderInline (generated) at (0,0) size 12x19
             RenderCounter at (0,0) size 12x19
@@ -120,7 +120,7 @@
             RenderCounter at (638,0) size 78x19
               text run at (638,0) width 78: "i.mmmcdxci"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 716x19
           text run at (0,0) width 16: "i.i "
           text run at (16,0) width 20: "i.ii "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-08-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-08-b-expected.txt
index 57c7993..36707e2 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-08-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-08-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 954x585
   RenderView at (0,0) size 800x585
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 14x19
           RenderInline (generated) at (0,0) size 14x19
             RenderCounter at (0,0) size 14x19
@@ -120,7 +120,7 @@
             RenderCounter at (844,0) size 102x19
               text run at (844,0) width 102: "I.MMMCDXCI"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 946x19
           text run at (0,0) width 18: "I.I "
           text run at (18,0) width 23: "I.II "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-09-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-09-b-expected.txt
index 8ba99f2..c6fbff5 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-09-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-09-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 1064x585
   RenderView at (0,0) size 800x585
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
@@ -246,7 +246,7 @@
             RenderCounter at (998,0) size 58x19
               text run at (998,0) width 58: "\x{10D0}.\x{10F5}\x{10F0}\x{10E8}\x{10DF}\x{10D7}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 1056x19
           text run at (0,0) width 24: "\x{10D0}.\x{10D0} "
           text run at (24,0) width 24: "\x{10D0}.\x{10D1} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-11-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-11-b-expected.txt
index 777a0fc..2da238a 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-11-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-11-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 18x19
           RenderInline (generated) at (0,0) size 18x19
             RenderCounter at (0,0) size 18x19
@@ -78,7 +78,7 @@
             RenderCounter at (239,0) size 15x19
               text run at (239,0) width 15: "a.l"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 254x19
           text run at (0,0) width 22: "a.a "
           text run at (22,0) width 23: "a.b "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-12-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-12-b-expected.txt
index 777a0fc..2da238a 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-12-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-12-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 18x19
           RenderInline (generated) at (0,0) size 18x19
             RenderCounter at (0,0) size 18x19
@@ -78,7 +78,7 @@
             RenderCounter at (239,0) size 15x19
               text run at (239,0) width 15: "a.l"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 254x19
           text run at (0,0) width 22: "a.a "
           text run at (22,0) width 23: "a.b "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-13-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-13-b-expected.txt
index 450f8e7..11aa122 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-13-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-13-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 28x19
           RenderInline (generated) at (0,0) size 28x19
             RenderCounter at (0,0) size 28x19
@@ -78,7 +78,7 @@
             RenderCounter at (332,0) size 26x19
               text run at (332,0) width 26: "A.L"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 358x19
           text run at (0,0) width 32: "A.A "
           text run at (32,0) width 31: "A.B "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-14-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-14-b-expected.txt
index 450f8e7..11aa122 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-14-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-14-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 28x19
           RenderInline (generated) at (0,0) size 28x19
             RenderCounter at (0,0) size 28x19
@@ -78,7 +78,7 @@
             RenderCounter at (332,0) size 26x19
               text run at (332,0) width 26: "A.L"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 358x19
           text run at (0,0) width 32: "A.A "
           text run at (32,0) width 31: "A.B "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-15-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-15-b-expected.txt
index ea85b25..ed7b9e0 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-15-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-15-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
@@ -78,7 +78,7 @@
             RenderCounter at (257,0) size 21x19
               text run at (257,0) width 21: "\x{3B1}.\x{3BC}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 278x19
           text run at (0,0) width 24: "\x{3B1}.\x{3B1} "
           text run at (24,0) width 24: "\x{3B1}.\x{3B2} "
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
index 887f0c0..eb5ee80 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-16-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 33x19
           RenderInline (generated) at (0,0) size 33x19
             RenderCounter at (0,0) size 20x19
@@ -28,7 +28,7 @@
               text run at (96,0) width 10: "--"
             RenderCounter at (106,0) size 51x19
               text run at (106,0) width 51: "1-------3"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 157x19
           text run at (0,0) width 96: "1.1 - 12 - 1.3-- "
           text run at (96,0) width 61: "--1-------3"
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-17-d-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-17-d-expected.txt
index ad747e6..3b9fba0 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-17-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-17-d-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 33x19
           RenderInline (generated) at (0,0) size 33x19
             RenderCounter at (0,0) size 20x19
@@ -27,6 +27,6 @@
               text run at (82,0) width 48: "--       --"
             RenderCounter at (130,0) size 51x19
               text run at (130,0) width 51: "1-------3"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 181x19
           text run at (0,0) width 181: "1.1 - 12 - 1.3--       --1-------3"
diff --git a/LayoutTests/platform/efl/css2.1/t1202-counters-18-f-expected.txt b/LayoutTests/platform/efl/css2.1/t1202-counters-18-f-expected.txt
index 816475dc..6fe13aa 100644
--- a/LayoutTests/platform/efl/css2.1/t1202-counters-18-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1202-counters-18-f-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 292x19
           text run at (0,0) width 292: "The following two lines should look the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
@@ -78,7 +78,7 @@
             RenderCounter at (280,0) size 28x19
               text run at (280,0) width 28: "1.12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 308x19
           text run at (0,0) width 24: "1.1 "
           text run at (24,0) width 24: "1.2 "
diff --git a/LayoutTests/platform/efl/css2.1/t1204-implied-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-implied-00-b-expected.txt
index 3931f46..2972e72 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-implied-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-implied-00-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -15,6 +15,6 @@
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (8,0) size 8x19
               text run at (8,0) width 8: "0"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 16x19
           text run at (0,0) width 16: "00"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-implied-01-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-implied-01-c-expected.txt
index 9375251..8b5e738 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-implied-01-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-implied-01-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 277x19
           text run at (0,0) width 277: "The following two lines should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 12x19
           RenderInline (generated) at (0,0) size 12x19
             RenderCounter at (0,0) size 8x19
@@ -19,6 +19,6 @@
               RenderCounter at (12,0) size 8x19
                 text run at (12,0) width 8: "1"
               RenderText at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 20x19
           text run at (0,0) width 20: "0 1"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-implied-02-d-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-implied-02-d-expected.txt
index 30db13c..6951ba4 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-implied-02-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-implied-02-d-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 277x19
           text run at (0,0) width 277: "The following two lines should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 35x19
           RenderInline (generated) at (0,0) size 11x19
             RenderText at (0,0) size 11x19
@@ -37,6 +37,6 @@
                 RenderCounter at (47,0) size 20x19
                   text run at (47,0) width 20: "1.0"
                 RenderText at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 67x19
           text run at (0,0) width 67: "B1 0 1 1.0"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-multiple-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-multiple-00-c-expected.txt
index dfb210f..73adee6 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-multiple-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-multiple-00-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -15,6 +15,6 @@
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (8,0) size 8x19
               text run at (8,0) width 8: "2"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 16x19
           text run at (0,0) width 16: "12"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-multiple-01-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-multiple-01-c-expected.txt
index dfb210f..73adee6 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-multiple-01-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-multiple-01-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -15,6 +15,6 @@
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (8,0) size 8x19
               text run at (8,0) width 8: "2"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 16x19
           text run at (0,0) width 16: "12"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-order-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-order-00-c-expected.txt
index 6a98e3a..7061869 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-order-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-order-00-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline {SPAN} at (0,0) size 8x19
             RenderInline (generated) at (0,0) size 8x19
@@ -118,7 +118,7 @@
               RenderCounter at (220,0) size 16x19
                 text run at (220,0) width 16: "12"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 236x19
           text run at (0,0) width 12: "0 "
           text run at (12,0) width 12: "1 "
diff --git a/LayoutTests/platform/efl/css2.1/t1204-order-01-d-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-order-01-d-expected.txt
index 74bdae4..ce5f23a 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-order-01-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-order-01-d-expected.txt
@@ -1,66 +1,66 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x184
-  RenderBlock {HTML} at (0,0) size 800x184
-    RenderBody {BODY} at (8,16) size 784x160
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x177
+  RenderBlock {HTML} at (0,0) size 800x177
+    RenderBody {BODY} at (8,16) size 784x153
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 730x19
           text run at (0,0) width 408: "You should see nine boxes below, each just containing a unique "
           text run at (408,0) width 322: "multiple of eleven, from 11 to 99, and nothing else."
-      RenderBlock {UL} at (0,35) size 784x125
-        RenderBlock {LI} at (0,0) size 50x21 [border: (1px solid #000000)]
+      RenderBlock {UL} at (0,34) size 784x119
+        RenderBlock {LI} at (0,0) size 50x20 [border: (1px solid #000000)]
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (1,1) size 8x19
               text run at (1,1) width 8: "1"
           RenderText {#text} at (9,1) size 8x19
             text run at (9,1) width 8: "1"
-        RenderBlock (floating) {LI} at (0,21) size 50x21 [border: (1px solid #000000)]
+        RenderBlock (floating) {LI} at (0,20) size 50x20 [border: (1px solid #000000)]
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (1,1) size 8x19
               text run at (1,1) width 8: "2"
           RenderText {#text} at (9,1) size 8x19
             text run at (9,1) width 8: "2"
-        RenderBlock {LI} at (0,62) size 50x21 [border: (1px solid #000000)]
+        RenderBlock {LI} at (0,59) size 50x20 [border: (1px solid #000000)]
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (1,1) size 8x19
               text run at (1,1) width 8: "5"
           RenderText {#text} at (9,1) size 8x19
             text run at (9,1) width 8: "5"
-        RenderBlock {LI} at (0,83) size 50x21 [border: (1px solid #000000)]
+        RenderBlock {LI} at (0,79) size 50x20 [border: (1px solid #000000)]
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (1,1) size 8x19
               text run at (1,1) width 8: "7"
           RenderText {#text} at (9,1) size 8x19
             text run at (9,1) width 8: "7"
-        RenderBlock {LI} at (0,104) size 50x21 [border: (1px solid #000000)]
+        RenderBlock {LI} at (0,99) size 50x20 [border: (1px solid #000000)]
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (1,1) size 8x19
               text run at (1,1) width 8: "9"
           RenderText {#text} at (9,1) size 8x19
             text run at (9,1) width 8: "9"
-layer at (8,72) size 50x41
-  RenderBlock (relative positioned) {LI} at (0,21) size 50x41 [border: (1px solid #000000)]
+layer at (8,70) size 50x39
+  RenderBlock (relative positioned) {LI} at (0,20) size 50x39 [border: (1px solid #000000)]
     RenderInline (generated) at (0,0) size 8x19
-      RenderCounter at (1,21) size 8x19
-        text run at (1,21) width 8: "3"
-    RenderText {#text} at (9,21) size 8x19
-      text run at (9,21) width 8: "3"
-layer at (136,113) size 50x21
-  RenderBlock (positioned) {DIV} at (128,0) size 50x21 [border: (1px solid #000000)]
+      RenderCounter at (1,20) size 8x19
+        text run at (1,20) width 8: "3"
+    RenderText {#text} at (9,20) size 8x19
+      text run at (9,20) width 8: "3"
+layer at (136,109) size 50x20
+  RenderBlock (positioned) {DIV} at (128,0) size 50x20 [border: (1px solid #000000)]
     RenderInline (generated) at (0,0) size 8x19
       RenderCounter at (1,1) size 8x19
         text run at (1,1) width 8: "4"
     RenderText {#text} at (9,1) size 8x19
       text run at (9,1) width 8: "4"
-layer at (192,80) size 50x21
-  RenderBlock (positioned) {LI} at (192,80) size 50x21 [border: (1px solid #000000)]
+layer at (192,80) size 50x20
+  RenderBlock (positioned) {LI} at (192,80) size 50x20 [border: (1px solid #000000)]
     RenderInline (generated) at (0,0) size 8x19
       RenderCounter at (1,1) size 8x19
         text run at (1,1) width 8: "6"
     RenderText {#text} at (9,1) size 8x19
       text run at (9,1) width 8: "6"
-layer at (64,128) size 50x21
-  RenderBlock (positioned) {LI} at (64,128) size 50x21 [border: (1px solid #000000)]
+layer at (64,128) size 50x20
+  RenderBlock (positioned) {LI} at (64,128) size 50x20 [border: (1px solid #000000)]
     RenderInline (generated) at (0,0) size 8x19
       RenderCounter at (1,1) size 8x19
         text run at (1,1) width 8: "8"
diff --git a/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
index 872d40c..a6b92b8 100644
--- a/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
     RenderBlock (anonymous) at (0,0) size 800x0
       RenderInline (generated) at (0,0) size 0x0
         RenderText at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 20x19
           RenderInline (generated) at (0,0) size 20x19
             RenderCounter at (0,0) size 20x19
               text run at (0,0) width 20: "4.8"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 20x19
           text run at (0,0) width 20: "4.8"
diff --git a/LayoutTests/platform/efl/css2.1/t120401-scope-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t120401-scope-00-b-expected.txt
index 2b5accb..a214f69 100644
--- a/LayoutTests/platform/efl/css2.1/t120401-scope-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120401-scope-00-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "The next 2 lines should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 40x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
@@ -56,7 +56,7 @@
             RenderCounter at (92,0) size 8x19
               text run at (92,0) width 8: "1"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 100x19
           text run at (0,0) width 52: "122111 "
           text run at (52,0) width 48: "133331"
diff --git a/LayoutTests/platform/efl/css2.1/t120401-scope-01-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120401-scope-01-c-expected.txt
index 5ed3618..58b1a8e 100644
--- a/LayoutTests/platform/efl/css2.1/t120401-scope-01-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120401-scope-01-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 279x19
           text run at (0,0) width 279: "The following two lines should be the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 491x19
           RenderInline (generated) at (0,0) size 24x19
             RenderText at (0,0) size 11x19
@@ -112,6 +112,6 @@
               text run at (478,0) width 8: "3"
             RenderText at (486,0) size 5x19
               text run at (486,0) width 5: "-"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 491x19
           text run at (0,0) width 491: "B1-B2-B2.1-B2.2-A2.3-B2.4-A2.5-A2.6-B2.7-B2.8-A2.9-A2.10-A2.11-A3-"
diff --git a/LayoutTests/platform/efl/css2.1/t120401-scope-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120401-scope-02-c-expected.txt
index 441e733..43bf744 100644
--- a/LayoutTests/platform/efl/css2.1/t120401-scope-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120401-scope-02-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 279x19
           text run at (0,0) width 279: "The following two lines should be the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 195x19
           RenderInline (generated) at (0,0) size 24x19
             RenderText at (0,0) size 11x19
@@ -52,6 +52,6 @@
               text run at (182,0) width 8: "2"
             RenderText at (190,0) size 5x19
               text run at (190,0) width 5: "-"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 195x19
           text run at (0,0) width 195: "B1-B1.1-B1.2-A1.3-A1.4-A2-"
diff --git a/LayoutTests/platform/efl/css2.1/t120401-scope-03-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120401-scope-03-c-expected.txt
index 7c2ffe1..2f249b1 100644
--- a/LayoutTests/platform/efl/css2.1/t120401-scope-03-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120401-scope-03-c-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 279x19
           text run at (0,0) width 279: "The following two lines should be the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 159x19
           RenderInline (generated) at (0,0) size 24x19
             RenderText at (0,0) size 11x19
@@ -52,6 +52,6 @@
               text run at (146,0) width 8: "5"
             RenderText at (154,0) size 5x19
               text run at (154,0) width 5: "-"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 159x19
           text run at (0,0) width 159: "B1-B2-B3-A4-A4.1-A5-"
diff --git a/LayoutTests/platform/efl/css2.1/t120401-scope-04-d-expected.txt b/LayoutTests/platform/efl/css2.1/t120401-scope-04-d-expected.txt
index df1e8e6..775119b 100644
--- a/LayoutTests/platform/efl/css2.1/t120401-scope-04-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120401-scope-04-d-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 245x19
           text run at (0,0) width 245: "The next two lines should be the same:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 12x19
           RenderInline (generated) at (0,0) size 12x19
@@ -37,6 +37,6 @@
               RenderCounter at (59,0) size 20x19
                 text run at (59,0) width 20: "1.1"
               RenderText at (0,0) size 0x0
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 79x19
           text run at (0,0) width 79: "1 1 R1.1 1.1"
diff --git a/LayoutTests/platform/efl/css2.1/t120403-content-none-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120403-content-none-00-c-expected.txt
index 4cf5d54..34c58cf 100644
--- a/LayoutTests/platform/efl/css2.1/t120403-content-none-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120403-content-none-00-c-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
               text run at (0,0) width 8: "0"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 8x19
           text run at (0,0) width 8: "0"
diff --git a/LayoutTests/platform/efl/css2.1/t120403-display-none-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120403-display-none-00-c-expected.txt
index afca9d0..2c826f4 100644
--- a/LayoutTests/platform/efl/css2.1/t120403-display-none-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120403-display-none-00-c-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
               text run at (0,0) width 8: "0"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 8x19
           text run at (0,0) width 8: "0"
diff --git a/LayoutTests/platform/efl/css2.1/t120403-visibility-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t120403-visibility-00-c-expected.txt
index 533ae9c..821798f 100644
--- a/LayoutTests/platform/efl/css2.1/t120403-visibility-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t120403-visibility-00-c-expected.txt
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x97
-  RenderBlock {HTML} at (0,0) size 800x97
-    RenderBody {BODY} at (8,16) size 784x73
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x94
+  RenderBlock {HTML} at (0,0) size 800x94
+    RenderBody {BODY} at (8,16) size 784x70
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 216x19
           text run at (0,0) width 216: "The following should be identical:"
-      RenderBlock {DIV} at (0,35) size 784x19
+      RenderBlock {DIV} at (0,34) size 784x18
         RenderInline {SPAN} at (0,0) size 0x0
         RenderInline {SPAN} at (0,0) size 8x19
           RenderInline (generated) at (0,0) size 8x19
             RenderCounter at (0,0) size 8x19
               text run at (0,0) width 8: "1"
-      RenderBlock {DIV} at (0,54) size 784x19
+      RenderBlock {DIV} at (0,52) size 784x18
         RenderText {#text} at (0,0) size 8x19
           text run at (0,0) width 8: "1"
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
index 0e73416..d8a3e9b 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c561-list-displ-00-b-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x178
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 757x19
           text run at (0,0) width 757: "There should be eight numbered lines below, all identical except for the numbering, which should match the description."
-      RenderListItem {DIV} at (0,35) size 784x19 [color=#000080]
+      RenderListItem {DIV} at (0,34) size 784x18 [color=#000080]
         RenderListMarker at (0,0) size 16x19: "1"
         RenderText {#text} at (16,0) size 151x19
           text run at (16,0) width 151: "This should be line one."
-      RenderBlock {DIV} at (0,54) size 784x19 [color=#000080]
+      RenderBlock {DIV} at (0,52) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 168x19
           text run at (0,0) width 168: "2. This should be line two."
-      RenderBlock (anonymous) at (0,73) size 784x19
+      RenderBlock (anonymous) at (0,70) size 784x18
         RenderInline {DIV} at (0,0) size 94x19 [color=#000080]
           RenderText {#text} at (0,0) size 94x19
             text run at (0,0) width 94: "3. This should "
@@ -22,20 +22,20 @@
           RenderText {#text} at (94,0) size 81x19
             text run at (94,0) width 81: "be line three."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,92) size 784x19 [color=#000080]
+      RenderBlock {DIV} at (0,88) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 170x19
           text run at (0,0) width 170: "4. This should be line four."
-      RenderBlock {DIV} at (0,111) size 784x19 [color=#000080]
+      RenderBlock {DIV} at (0,106) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 168x19
           text run at (0,0) width 168: "5. This should be line five."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,130) size 784x57 [color=#000080]
-        RenderBlock (anonymous) at (0,0) size 784x19
+      RenderBlock {DIV} at (0,124) size 784x54 [color=#000080]
+        RenderBlock (anonymous) at (0,0) size 784x18
           RenderText {#text} at (0,0) size 162x19
             text run at (0,0) width 162: "6. This should be line six."
-        RenderBlock {A} at (0,19) size 784x19
+        RenderBlock {A} at (0,18) size 784x18
           RenderText {#text} at (0,0) size 180x19
             text run at (0,0) width 180: "7. This should be line seven."
-        RenderBlock (anonymous) at (0,38) size 784x19
+        RenderBlock (anonymous) at (0,36) size 784x18
           RenderText {#text} at (0,0) size 175x19
             text run at (0,0) width 175: "8. This should be line eight."
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-00-b-expected.txt
index b5411be..67a5dd6 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-00-b-expected.txt
@@ -1,57 +1,57 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x343
-  RenderBlock {HTML} at (0,0) size 800x343
-    RenderBody {BODY} at (8,16) size 784x311 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x330
+  RenderBlock {HTML} at (0,0) size 800x330
+    RenderBody {BODY} at (8,16) size 784x298 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 458x19
           text run at (0,0) width 458: "Each bullet should look as described, and there should be no red present."
-      RenderBlock {UL} at (0,35) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,34) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
-      RenderBlock {UL} at (0,108) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,104) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: white bullet
           RenderText {#text} at (0,0) size 34x19
             text run at (0,0) width 34: "circle"
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-18,0) size 7x19: white bullet
           RenderText {#text} at (0,0) size 34x19
             text run at (0,0) width 34: "circle"
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-18,0) size 7x19: white bullet
           RenderText {#text} at (0,0) size 34x19
             text run at (0,0) width 34: "circle"
-      RenderBlock {UL} at (0,181) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,174) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: black square
           RenderText {#text} at (0,0) size 41x19
             text run at (0,0) width 41: "square"
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-18,0) size 7x19: black square
           RenderText {#text} at (0,0) size 41x19
             text run at (0,0) width 41: "square"
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-18,0) size 7x19: black square
           RenderText {#text} at (0,0) size 41x19
             text run at (0,0) width 41: "square"
-      RenderBlock {UL} at (0,254) size 784x57 [color=#FF0000]
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,244) size 784x54 [color=#FF0000]
+        RenderListItem {LI} at (40,0) size 744x18
           RenderText {#text} at (0,0) size 4x19
             text run at (0,0) width 4: " "
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderText {#text} at (0,0) size 4x19
             text run at (0,0) width 4: " "
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderText {#text} at (0,0) size 4x19
             text run at (0,0) width 4: " "
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-01-b-expected.txt
index 0a85a58..fbd2154 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c563-list-type-01-b-expected.txt
@@ -1,73 +1,73 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x416
-  RenderBlock {HTML} at (0,0) size 800x416
-    RenderBody {BODY} at (8,16) size 784x384 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x400
+  RenderBlock {HTML} at (0,0) size 800x400
+    RenderBody {BODY} at (8,16) size 784x368 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 388x19
           text run at (0,0) width 388: "The two columns should look the same, except for alignment."
-      RenderBlock {OL} at (0,35) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {OL} at (0,34) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-17,0) size 12x19: "i"
           RenderText {#text} at (0,0) size 8x19
             text run at (0,0) width 8: "i."
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-21,0) size 16x19: "ii"
           RenderText {#text} at (0,0) size 12x19
             text run at (0,0) width 12: "ii."
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-25,0) size 20x19: "iii"
           RenderText {#text} at (0,0) size 16x19
             text run at (0,0) width 16: "iii."
-      RenderBlock {OL} at (0,108) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {OL} at (0,104) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 13x19: "I"
           RenderText {#text} at (0,0) size 9x19
             text run at (0,0) width 9: "I."
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-23,0) size 18x19: "II"
           RenderText {#text} at (0,0) size 14x19
             text run at (0,0) width 14: "II."
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-28,0) size 23x19: "III"
           RenderText {#text} at (0,0) size 19x19
             text run at (0,0) width 19: "III."
-      RenderBlock {OL} at (0,181) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {OL} at (0,174) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-20,0) size 15x19: "a"
           RenderText {#text} at (0,0) size 11x19
             text run at (0,0) width 11: "a."
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-21,0) size 16x19: "b"
           RenderText {#text} at (0,0) size 12x19
             text run at (0,0) width 12: "b."
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-20,0) size 15x19: "c"
           RenderText {#text} at (0,0) size 11x19
             text run at (0,0) width 11: "c."
-      RenderBlock {OL} at (0,254) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {OL} at (0,244) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-25,0) size 20x19: "A"
           RenderText {#text} at (0,0) size 16x19
             text run at (0,0) width 16: "A."
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-24,0) size 19x19: "B"
           RenderText {#text} at (0,0) size 15x19
             text run at (0,0) width 15: "B."
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-24,0) size 19x19: "C"
           RenderText {#text} at (0,0) size 15x19
             text run at (0,0) width 15: "C."
-      RenderBlock {OL} at (0,327) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {OL} at (0,314) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-25,0) size 20x19: "A"
           RenderText {#text} at (0,0) size 16x19
             text run at (0,0) width 16: "A."
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-24,0) size 19x19: "B"
           RenderText {#text} at (0,0) size 15x19
             text run at (0,0) width 15: "B."
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-21,0) size 16x19: "3"
           RenderText {#text} at (0,0) size 12x19
             text run at (0,0) width 12: "3."
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c564-list-img-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c564-list-img-00-b-g-expected.txt
index 6dbedea..1424b37 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c564-list-img-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c564-list-img-00-b-g-expected.txt
@@ -1,34 +1,34 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x203
-  RenderBlock {HTML} at (0,0) size 800x203
-    RenderBody {BODY} at (8,16) size 784x171 [color=#000080]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x196
+  RenderBlock {HTML} at (0,0) size 800x196
+    RenderBody {BODY} at (8,16) size 784x164 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 234x19
           text run at (0,0) width 234: "Each bullet should look as described."
-      RenderBlock {UL} at (0,35) size 784x63
-        RenderListItem {LI} at (40,0) size 744x21
+      RenderBlock {UL} at (0,34) size 784x60
+        RenderListItem {LI} at (40,0) size 744x20
           RenderListMarker at (-24,0) size 17x17
           RenderText {#text} at (0,2) size 85x19
             text run at (0,2) width 85: "purple square"
-        RenderListItem {LI} at (40,21) size 744x21
+        RenderListItem {LI} at (40,20) size 744x20
           RenderListMarker at (-24,0) size 17x17
           RenderText {#text} at (0,2) size 85x19
             text run at (0,2) width 85: "purple square"
-        RenderListItem {LI} at (40,42) size 744x21
+        RenderListItem {LI} at (40,40) size 744x20
           RenderListMarker at (-24,0) size 17x17
           RenderText {#text} at (0,2) size 85x19
             text run at (0,2) width 85: "purple square"
-      RenderBlock {UL} at (0,114) size 784x57
-        RenderListItem {LI} at (40,0) size 744x19
+      RenderBlock {UL} at (0,110) size 784x54
+        RenderListItem {LI} at (40,0) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
-        RenderListItem {LI} at (40,19) size 744x19
+        RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
-        RenderListItem {LI} at (40,38) size 744x19
+        RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 25x19
             text run at (0,0) width 25: "disc"
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c565-list-pos-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c565-list-pos-00-b-expected.txt
index b48b73d..5a7fffc 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c565-list-pos-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c565-list-pos-00-b-expected.txt
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x98
-  RenderBlock {HTML} at (0,0) size 800x98
-    RenderBody {BODY} at (8,16) size 784x74
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,16) size 784x71
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 363x19
           text run at (0,0) width 363: "The following two boxes should be identical, to the pixel."
-      RenderBlock {OL} at (80,35) size 160x19 [color=#FFFFFF] [bgcolor=#000080]
-        RenderListItem {LI} at (0,0) size 160x19
+      RenderBlock {OL} at (80,34) size 160x18 [color=#FFFFFF] [bgcolor=#000080]
+        RenderListItem {LI} at (0,0) size 160x18
           RenderListMarker at (-21,0) size 16x19: "1"
           RenderInline {SPAN} at (0,0) size 12x19 [color=#000080]
             RenderText {#text} at (0,0) size 12x19
               text run at (0,0) width 12: "1."
           RenderText {#text} at (12,0) size 31x19
             text run at (12,0) width 31: " Test"
-      RenderBlock {OL} at (80,55) size 160x19 [color=#000080] [bgcolor=#000080]
-        RenderListItem {LI} at (0,0) size 160x19
+      RenderBlock {OL} at (80,53) size 160x18 [color=#000080] [bgcolor=#000080]
+        RenderListItem {LI} at (0,0) size 160x18
           RenderListMarker at (0,0) size 16x19: "1"
           RenderInline {SPAN} at (0,0) size 27x19 [color=#FFFFFF]
             RenderText {#text} at (16,0) size 27x19
diff --git a/LayoutTests/platform/efl/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
index 45b7099..c8acd7d 100644
--- a/LayoutTests/platform/efl/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x117
-  RenderBlock {HTML} at (0,0) size 800x117
-    RenderBody {BODY} at (8,16) size 784x86
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x116
+  RenderBlock {HTML} at (0,0) size 800x116
+    RenderBody {BODY} at (8,16) size 784x85
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "There should be no red below."
-      RenderBlock {UL} at (75,35) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {UL} at (75,34) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderListItem {LI} at (3,3) size 90x45
           RenderListMarker at (0,0) size 45x15: "A"
           RenderText {#text} at (45,0) size 90x45
diff --git a/LayoutTests/platform/efl/css2.1/t1401-c531-color-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1401-c531-color-00-a-expected.txt
index 4e08623..b14d2e6 100644
--- a/LayoutTests/platform/efl/css2.1/t1401-c531-color-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1401-c531-color-00-a-expected.txt
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+      RenderBlock {P} at (0,34) size 784x18 [color=#008000]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t1402-c45-bg-canvas-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1402-c45-bg-canvas-00-b-expected.txt
index 54bbd09..1f03b06 100644
--- a/LayoutTests/platform/efl/css2.1/t1402-c45-bg-canvas-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1402-c45-bg-canvas-00-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x69
-  RenderBlock {HTML} at (0,0) size 800x69 [bgcolor=#800080]
-    RenderBody {BODY} at (25,25) size 750x19 [color=#FFFFFF] [bgcolor=#000080]
-      RenderBlock {P} at (0,0) size 750x19
+layer at (0,0) size 800x68
+  RenderBlock {HTML} at (0,0) size 800x68 [bgcolor=#800080]
+    RenderBody {BODY} at (25,25) size 750x18 [color=#FFFFFF] [bgcolor=#000080]
+      RenderBlock {P} at (0,0) size 750x18
         RenderText {#text} at (0,0) size 665x19
           text run at (0,0) width 379: "This paragraph should be in a blue block near the top of the "
           text run at (379,0) width 286: "page. Around it on all sides should be purple."
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-00-a-expected.txt
index 2638664..bc314fd 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-00-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19 [bgcolor=#00FF00]
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,16) size 784x86
+      RenderBlock {P} at (0,0) size 784x18 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19 [bgcolor=#00FF00]
+      RenderBlock {P} at (0,34) size 784x18 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 59x19
           text run at (0,0) width 59: "This line "
         RenderInline {SPAN} at (0,0) size 100x19
@@ -14,6 +14,6 @@
             text run at (59,0) width 100: "should be green"
         RenderText {#text} at (159,0) size 28x19
           text run at (159,0) width 28: " too."
-      RenderBlock {P} at (0,70) size 784x19 [bgcolor=#AAFFAA]
+      RenderBlock {P} at (0,68) size 784x18 [bgcolor=#AAFFAA]
         RenderText {#text} at (0,0) size 193x19
           text run at (0,0) width 193: "This line should be pale green."
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-01-b-expected.txt
index eb191be..778e8fd 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c532-bgcolor-01-b-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18 [color=#008000]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-00-a-expected.txt
index b3096f91..d5b4b56 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-00-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
-      RenderBlock {P} at (0,35) size 784x19
+      RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 59x19
           text run at (0,0) width 59: "This line "
         RenderInline {SPAN} at (0,0) size 100x19
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-01-b-g-expected.txt
index eb191be..778e8fd 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c533-bgimage-01-b-g-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
-  RenderBlock {HTML} at (0,0) size 800x51
-    RenderBody {BODY} at (8,16) size 784x19 [color=#008000]
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x50
+  RenderBlock {HTML} at (0,0) size 800x50
+    RenderBody {BODY} at (8,16) size 784x18 [color=#008000]
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 163x19
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
index fcbf97a..fdee938 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x290
-  RenderBlock {HTML} at (0,0) size 800x290
-    RenderBody {BODY} at (8,16) size 784x266
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x289
+  RenderBlock {HTML} at (0,0) size 800x289
+    RenderBody {BODY} at (8,16) size 784x265
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 150x75
           RenderText {#text} at (0,0) size 150x75
             text run at (0,0) width 150: " xxxxxxxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
index ae33f0c..86b111e 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x290
-  RenderBlock {HTML} at (0,0) size 800x290
-    RenderBody {BODY} at (8,16) size 784x266
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x289
+  RenderBlock {HTML} at (0,0) size 800x289
+    RenderBody {BODY} at (8,16) size 784x265
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 150x75
           RenderText {#text} at (0,0) size 150x75
             text run at (0,0) width 150: "z         "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
index bbe1adc..dc7bd85 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: "xxxx x xxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
index bd08e35..c07a823 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: "     x     "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
index f667d11..9e2b5fb 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: "  _  _  _  "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
index 0681c7c..1bdbe4c 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: "  r  r  r  "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
index 49ccec8..f19cbd2 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: " r  r  r  r"
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
index a3a3ea0..78644e7 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x135
-  RenderBlock {HTML} at (0,0) size 800x135
-    RenderBody {BODY} at (8,16) size 784x111
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x110
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 238x19
           text run at (0,0) width 238: "There should be a green block below."
-      RenderBlock {DIV} at (0,35) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
           RenderText {#text} at (0,0) size 154x71
             text run at (0,0) width 154: " rr rr rr r"
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt
index 22a6152..64b56a6 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt
@@ -1,486 +1,486 @@
-layer at (0,0) size 785x3088
+layer at (0,0) size 785x2928
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x3088
-  RenderBlock {HTML} at (0,0) size 785x3088
-    RenderBody {BODY} at (8,8) size 769x3072
-      RenderBlock {DIV} at (0,0) size 769x19 [color=#C0C0C0]
+layer at (0,0) size 785x2928
+  RenderBlock {HTML} at (0,0) size 785x2928
+    RenderBody {BODY} at (8,8) size 769x2912
+      RenderBlock {DIV} at (0,0) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,19) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,18) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,38) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,36) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,73) size 769x19
+      RenderBlock {P} at (0,70) size 769x18
         RenderText {#text} at (0,0) size 617x19
           text run at (0,0) width 396: "Scroll this document. A line of blue should remain stuck at the "
           text run at (396,0) width 221: "top of the viewport the whole time."
-      RenderBlock {DIV} at (0,108) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,104) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,127) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,122) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,146) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,140) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,165) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,158) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,184) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,176) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,203) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,194) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,222) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,212) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,241) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,230) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,260) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,248) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,279) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,266) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,298) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,284) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,317) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,302) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,336) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,320) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,355) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,338) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,374) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,356) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,393) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,374) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,412) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,392) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,431) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,410) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,450) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,428) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,469) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,446) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,488) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,464) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,507) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,482) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,526) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,500) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,545) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,518) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,564) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,536) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,583) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,554) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,602) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,572) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,621) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,590) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,640) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,608) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,659) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,626) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,678) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,644) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,697) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,662) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,716) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,680) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,735) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,698) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,754) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,716) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,773) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,734) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,792) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,752) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,811) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,770) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,830) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,788) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,849) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,806) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,868) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,824) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,887) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,842) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,906) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,860) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,925) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,878) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,944) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,896) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,963) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,914) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,982) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,932) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1001) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,950) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1020) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,968) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1039) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,986) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1058) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1004) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1077) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1022) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1096) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1040) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1115) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1058) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1134) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1076) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1153) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1094) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1172) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1112) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1191) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1130) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1210) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1148) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1229) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1166) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1248) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1184) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1267) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1202) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1286) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1220) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1305) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1238) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1324) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1256) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1343) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1274) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1362) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1292) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1381) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1310) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1400) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1328) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1419) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1346) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1438) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1364) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1457) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1382) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1476) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1400) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1495) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1418) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1514) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1436) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1533) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1454) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1552) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1472) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1571) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1490) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1590) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1508) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1609) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1526) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1628) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1544) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1647) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1562) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1666) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1580) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1685) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1598) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1704) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1616) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1723) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1634) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1742) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1652) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1761) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1670) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1780) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1688) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1799) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1706) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1818) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1724) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1837) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1742) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1856) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1760) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1875) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1778) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1894) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1796) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1913) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1814) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1932) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1832) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1951) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1850) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1970) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1868) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,1989) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1886) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2008) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1904) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2027) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1922) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2046) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1940) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2065) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1958) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2084) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1976) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2103) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,1994) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2122) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2012) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2141) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2030) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2160) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2048) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2179) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2066) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2198) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2084) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2217) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2102) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2236) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2120) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2255) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2138) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2274) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2156) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2293) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2174) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2312) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2192) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2331) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2210) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2350) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2228) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2369) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2246) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2388) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2264) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2407) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2282) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2426) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2300) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2445) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2318) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2464) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2336) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2483) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2354) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2502) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2372) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2521) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2390) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2540) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2408) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2559) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2426) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2578) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2444) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2597) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2462) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2616) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2480) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2635) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2498) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2654) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2516) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2673) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2534) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2692) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2552) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2711) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2570) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2730) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2588) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2749) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2606) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2768) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2624) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2787) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2642) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2806) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2660) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2825) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2678) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2844) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2696) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2863) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2714) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2882) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2732) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2901) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2750) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2920) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2768) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2939) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2786) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2958) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2804) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2977) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2822) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,2996) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2840) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,3015) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2858) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,3034) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2876) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {DIV} at (0,3053) size 769x19 [color=#C0C0C0]
+      RenderBlock {DIV} at (0,2894) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
index 8feeb2d..fbccd82 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
@@ -1,29 +1,29 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x291
-  RenderBlock {HTML} at (0,0) size 800x291
-    RenderBody {BODY} at (0,0) size 800x291
+layer at (0,0) size 800x290
+  RenderBlock {HTML} at (0,0) size 800x290
+    RenderBody {BODY} at (0,0) size 800x290
       RenderBlock {DIV} at (0,0) size 800x15 [color=#FFFFFF]
         RenderText {#text} at (785,0) size 15x15
           text run at (785,0) width 15: "X"
-      RenderBlock {P} at (0,31) size 800x19
+      RenderBlock {P} at (0,31) size 800x18
         RenderText {#text} at (0,0) size 487x19
           text run at (0,0) width 487: "There should be no red on this page (look in the upper right hand corner too)."
-      RenderBlock {DIV} at (0,66) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,65) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
           text run at (0,30) width 165: "     X     "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "           "
-      RenderBlock {DIV} at (0,141) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,140) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
           text run at (0,30) width 165: "     X     "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "           "
-      RenderBlock {DIV} at (0,216) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,215) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
index 1b7cdae..0ca99f3 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
@@ -1,33 +1,33 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x351
-  RenderBlock {HTML} at (0,0) size 800x351
-    RenderBody {BODY} at (0,16) size 800x335
-      RenderBlock {P} at (0,0) size 800x19
+layer at (0,0) size 800x350
+  RenderBlock {HTML} at (0,0) size 800x350
+    RenderBody {BODY} at (0,16) size 800x334
+      RenderBlock {P} at (0,0) size 800x18
         RenderText {#text} at (0,0) size 230x19
           text run at (0,0) width 230: "There should be no red on this page."
-      RenderBlock {DIV} at (0,35) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,34) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
           text run at (0,30) width 165: "           "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "          X"
-      RenderBlock {DIV} at (0,110) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,109) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
           text run at (0,30) width 165: "X          "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "           "
-      RenderBlock {DIV} at (0,185) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,184) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "        X  "
           text run at (0,30) width 165: "           "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "           "
-      RenderBlock {DIV} at (0,260) size 165x75 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,259) size 165x75 [color=#FFFFFF]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "           "
           text run at (0,15) width 165: "           "
diff --git a/LayoutTests/platform/efl/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
index 05561a9..746f721 100644
--- a/LayoutTests/platform/efl/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
@@ -1,176 +1,176 @@
-layer at (0,0) size 785x1991
+layer at (0,0) size 785x1941
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1991
-  RenderBlock {HTML} at (0,0) size 785x1991
-    RenderBody {BODY} at (8,16) size 769x1959
-      RenderBlock {P} at (0,0) size 769x19 [color=#C0C0C0]
+layer at (0,0) size 785x1941
+  RenderBlock {HTML} at (0,0) size 785x1941
+    RenderBody {BODY} at (8,16) size 769x1909
+      RenderBlock {P} at (0,0) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,35) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,34) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,70) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,68) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,105) size 769x38
-        RenderText {#text} at (0,0) size 764x38
+      RenderBlock {P} at (0,102) size 769x36
+        RenderText {#text} at (0,0) size 764x37
           text run at (0,0) width 396: "Scroll this document. A line of blue should remain stuck at the "
           text run at (396,0) width 368: "top of the viewport the whole time, and there should be no"
-          text run at (0,19) width 24: "red "
-          text run at (24,19) width 179: "below, just a block of green."
-      RenderBlock {DIV} at (30,159) size 165x75 [color=#008000] [bgcolor=#008000]
+          text run at (0,18) width 24: "red "
+          text run at (24,18) width 179: "below, just a block of green."
+      RenderBlock {DIV} at (30,154) size 165x75 [color=#008000] [bgcolor=#008000]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "          X"
           text run at (0,15) width 165: "          X"
           text run at (0,30) width 165: "          X"
           text run at (0,45) width 165: "          X"
           text run at (0,60) width 165: "          X"
-      RenderBlock {DIV} at (30,234) size 165x75 [color=#008000] [bgcolor=#008000]
+      RenderBlock {DIV} at (30,229) size 165x75 [color=#008000] [bgcolor=#008000]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "     X     "
           text run at (0,15) width 165: "     X     "
           text run at (0,30) width 165: "     X     "
           text run at (0,45) width 165: "     X     "
           text run at (0,60) width 165: "     X     "
-      RenderBlock {DIV} at (30,309) size 165x75 [color=#008000] [bgcolor=#008000]
+      RenderBlock {DIV} at (30,304) size 165x75 [color=#008000] [bgcolor=#008000]
         RenderText {#text} at (0,0) size 165x75
           text run at (0,0) width 165: "XXXXXXXXXXX"
           text run at (0,15) width 165: "           "
           text run at (0,30) width 165: "           "
           text run at (0,45) width 165: "           "
           text run at (0,60) width 165: "           "
-      RenderBlock {P} at (0,400) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,395) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,435) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,429) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,470) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,463) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,505) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,497) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,540) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,531) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,575) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,565) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,610) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,599) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,645) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,633) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,680) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,667) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,715) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,701) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,750) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,735) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,785) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,769) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,820) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,803) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,855) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,837) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,890) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,871) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,925) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,905) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,960) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,939) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,995) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,973) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1030) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1007) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1065) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1041) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1100) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1075) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1135) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1109) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1170) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1143) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1205) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1177) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1240) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1211) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1275) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1245) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1310) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1279) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1345) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1313) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1380) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1347) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1415) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1381) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1450) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1415) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1485) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1449) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1520) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1483) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1555) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1517) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1590) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1551) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1625) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1585) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1660) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1619) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1695) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1653) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1730) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1687) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1765) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1721) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1800) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1755) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1835) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1789) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1870) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1823) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1905) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1857) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
-      RenderBlock {P} at (0,1940) size 769x19 [color=#C0C0C0]
+      RenderBlock {P} at (0,1891) size 769x18 [color=#C0C0C0]
         RenderText {#text} at (0,0) size 83x19
           text run at (0,0) width 83: "Dummy text."
diff --git a/LayoutTests/platform/efl/css2.1/t1503-c522-font-family-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1503-c522-font-family-00-b-expected.txt
index d100188..785b079 100644
--- a/LayoutTests/platform/efl/css2.1/t1503-c522-font-family-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1503-c522-font-family-00-b-expected.txt
@@ -1,49 +1,49 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x270
-  RenderBlock {HTML} at (0,0) size 800x270
-    RenderBody {BODY} at (8,8) size 784x254
-      RenderBlock {DIV} at (0,0) size 784x110
-        RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x259
+  RenderBlock {HTML} at (0,0) size 800x259
+    RenderBody {BODY} at (8,8) size 784x243
+      RenderBlock {DIV} at (0,0) size 784x105
+        RenderBlock {P} at (0,0) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 242x19
             text run at (0,0) width 242: "This sentence should be in a serif font."
-        RenderBlock {P} at (0,19) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,18) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 242x19
             text run at (0,0) width 242: "This sentence should be in a serif font."
-        RenderBlock {P} at (0,38) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,36) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 311x19
             text run at (0,0) width 311: "This sentence should be in a sans-serif font."
-        RenderBlock {P} at (0,57) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,54) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 260x19
             text run at (0,0) width 260: "This sentence should be in a cursive font."
-        RenderBlock {P} at (0,76) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,72) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 260x19
             text run at (0,0) width 260: "This sentence should be in a fantasy font."
-        RenderBlock {P} at (0,95) size 784x15 [color=#000080]
+        RenderBlock {P} at (0,90) size 784x15 [color=#000080]
           RenderText {#text} at (0,0) size 352x15
             text run at (0,0) width 352: "This sentence should be in a monospace font."
-      RenderBlock {P} at (0,110) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,105) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 311x19
           text run at (0,0) width 311: "This sentence should be in a sans-serif font."
-      RenderBlock {P} at (0,129) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,123) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 440x19
           text run at (0,0) width 440: "This sentence should be in a monospace font."
-      RenderBlock {DIV} at (0,148) size 784x106
+      RenderBlock {DIV} at (0,141) size 784x102
         RenderBlock {P} at (0,0) size 784x15 [color=#000080]
           RenderText {#text} at (0,0) size 352x15
             text run at (0,0) width 352: "This sentence should be in a monospace font."
-        RenderBlock {P} at (0,15) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,15) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 242x19
             text run at (0,0) width 242: "This sentence should be in a serif font."
-        RenderBlock {P} at (0,34) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,33) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 311x19
             text run at (0,0) width 311: "This sentence should be in a sans-serif font."
-        RenderBlock {P} at (0,53) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,51) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 260x19
             text run at (0,0) width 260: "This sentence should be in a cursive font."
-        RenderBlock {P} at (0,72) size 784x19 [color=#000080]
+        RenderBlock {P} at (0,69) size 784x18 [color=#000080]
           RenderText {#text} at (0,0) size 260x19
             text run at (0,0) width 260: "This sentence should be in a fantasy font."
-        RenderBlock {P} at (0,91) size 784x15 [color=#000080]
+        RenderBlock {P} at (0,87) size 784x15 [color=#000080]
           RenderText {#text} at (0,0) size 352x15
             text run at (0,0) width 352: "This sentence should be in a monospace font."
diff --git a/LayoutTests/platform/efl/css2.1/t1504-c523-font-style-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1504-c523-font-style-00-b-expected.txt
index b6919ec..add4871 100644
--- a/LayoutTests/platform/efl/css2.1/t1504-c523-font-style-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1504-c523-font-style-00-b-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x121
-  RenderBlock {HTML} at (0,0) size 800x121
-    RenderBody {BODY} at (8,16) size 784x89
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x118
+  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 215x19
           text run at (0,0) width 215: "This sentence should be in italics. "
         RenderInline {SPAN} at (0,0) size 203x19
           RenderText {#text} at (215,0) size 203x19
             text run at (215,0) width 203: "This sentence should be normal."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 205x19
           text run at (0,0) width 205: "This sentence should be oblique."
-      RenderBlock {P} at (0,70) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,68) size 784x18 [color=#000080]
         RenderInline {I} at (0,0) size 203x19
           RenderText {#text} at (0,0) size 203x19
             text run at (0,0) width 203: "This sentence should be normal."
diff --git a/LayoutTests/platform/efl/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
index 1457e78..9424ca7 100644
--- a/LayoutTests/platform/efl/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x403
-  RenderBlock {HTML} at (0,0) size 800x403
-    RenderBody {BODY} at (8,16) size 784x371
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x392
+  RenderBlock {HTML} at (0,0) size 800x392
+    RenderBody {BODY} at (8,16) size 784x360
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 226x19
           text run at (0,0) width 226: "This sentence should be underlined."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 218x19
           text run at (0,0) width 218: "This sentence should be overlined."
-      RenderBlock {P} at (0,70) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,68) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 232x19
           text run at (0,0) width 232: "This sentence should be stricken out."
-      RenderBlock {P} at (0,105) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,102) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 369x19
           text run at (0,0) width 369: "This sentence should be blinking (if the UA supports that)."
-      RenderBlock {P} at (0,140) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,136) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "The sentence should be underlined. "
         RenderInline {B} at (0,0) size 238x19
@@ -23,14 +23,14 @@
             text run at (227,0) width 238: "This sentence should be underlined"
         RenderText {#text} at (465,0) size 4x19
           text run at (465,0) width 4: "."
-      RenderBlock {P} at (0,175) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,170) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 316x19
           text run at (0,0) width 316: "This sentence should be underlined and overlined."
-      RenderBlock {P} at (0,210) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,204) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 377x19
           text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken."
-      RenderBlock {DIV} at (0,245) size 784x0 [color=#FF0000]
-      RenderBlock {P} at (0,245) size 784x19 [color=#000080]
+      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."
         RenderInline {STRONG} at (0,0) size 4x19 [color=#FF0000]
@@ -38,13 +38,13 @@
             text run at (285,0) width 4: " "
         RenderText {#text} at (289,0) size 4x19
           text run at (289,0) width 4: " "
-      RenderBlock {P} at (0,280) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,272) 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."
         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,315) size 784x21 [color=#000080]
+      RenderBlock {P} at (0,306) size 784x20 [color=#000080]
         RenderText {#text} at (0,2) size 202x19
           text run at (0,2) width 202: "This sentence and all its images "
         RenderImage {IMG} at (202,0) size 17x17 [color=#FF0000]
@@ -54,7 +54,7 @@
         RenderText {#text} at (240,2) size 140x19
           text run at (240,2) width 4: " "
           text run at (244,2) width 136: "should be underlined."
-      RenderBlock {P} at (0,352) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,342) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 335x19
           text run at (0,0) width 335: "There should be a long blue underline between here: "
         RenderInline {SPAN} at (0,0) size 160x19 [color=#FFFFFF]
diff --git a/LayoutTests/platform/efl/css2.1/t1505-c524-font-var-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1505-c524-font-var-00-b-expected.txt
index 210f4d3..be69275 100644
--- a/LayoutTests/platform/efl/css2.1/t1505-c524-font-var-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1505-c524-font-var-00-b-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x86
-  RenderBlock {HTML} at (0,0) size 800x86
-    RenderBody {BODY} at (8,16) size 784x54
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 268x19
           text run at (0,0) width 268: "This Paragraph should be in Small Caps."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 263x19
           text run at (0,0) width 263: "This Sentence should be in Small Caps. "
         RenderInline {SPAN} at (0,0) size 210x19
diff --git a/LayoutTests/platform/efl/css2.1/t1506-c525-font-wt-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1506-c525-font-wt-00-b-expected.txt
index f67b6b2..16ba4c8 100644
--- a/LayoutTests/platform/efl/css2.1/t1506-c525-font-wt-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1506-c525-font-wt-00-b-expected.txt
@@ -1,44 +1,44 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x451
-  RenderBlock {HTML} at (0,0) size 800x451
-    RenderBody {BODY} at (8,16) size 784x419
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x439
+  RenderBlock {HTML} at (0,0) size 800x439
+    RenderBody {BODY} at (8,16) size 784x407
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 203x19
           text run at (0,0) width 203: "This sentence should be normal."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 300x19
           text run at (0,0) width 300: "This sentence should be bolder than normal."
-      RenderBlock {P} at (0,70) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,68) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 198x19
           text run at (0,0) width 198: "This sentence should be bold."
-      RenderBlock {H4} at (0,110) size 784x19 [color=#000080]
+      RenderBlock {H4} at (0,107) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 202x19
           text run at (0,0) width 202: "Whatever this line looks like..."
-      RenderBlock {H4} at (0,150) size 784x19 [color=#000080]
+      RenderBlock {H4} at (0,146) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 290x19
           text run at (0,0) width 290: "...this line should look bolder (or the same)."
-      RenderBlock {P} at (0,190) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,185) size 784x18 [color=#000080]
         RenderInline {B} at (0,0) size 203x19
           RenderText {#text} at (0,0) size 203x19
             text run at (0,0) width 203: "This sentence should be normal."
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,225) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,219) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 219x19
           text run at (0,0) width 219: "This sentence should be very light."
-      RenderBlock {P} at (0,260) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,253) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 335x19
           text run at (0,0) width 335: "This sentence should be slightly bolder (or the same)."
-      RenderBlock {P} at (0,295) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,287) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 373x19
           text run at (0,0) width 373: "This sentence should be slightly bolder again (or the same)."
-      RenderBlock {P} at (0,330) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,321) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 417x19
           text run at (0,0) width 417: "This sentence should be slightly bolder still (but not the same)."
-      RenderBlock {P} at (0,365) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,355) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 509x19
           text run at (0,0) width 509: "This sentence should be the most bold (and maybe the same as the last one)."
-      RenderBlock {P} at (0,400) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,389) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 202x19
           text run at (0,0) width 202: "This sentence should be bold. "
         RenderInline {SPAN} at (0,0) size 203x19
diff --git a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-01-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-01-b-a-expected.txt
index 4b9109f..d569c79 100644
--- a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-01-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-01-b-a-expected.txt
@@ -1,26 +1,26 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (8,16) size 784x323
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x346
+  RenderBlock {HTML} at (0,0) size 800x346
+    RenderBody {BODY} at (8,16) size 784x322
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 472x19
           text run at (0,0) width 472: "There should be a solid single uninterrupted smooth column of blue below."
-      RenderBlock {DIV} at (96,35) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,34) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
-      RenderBlock {DIV} at (96,83) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,82) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
-      RenderBlock {DIV} at (96,131) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,130) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
-      RenderBlock {DIV} at (96,179) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,178) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
-      RenderBlock {DIV} at (96,227) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,226) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
-      RenderBlock {DIV} at (96,275) size 592x48 [color=#000080]
+      RenderBlock {DIV} at (96,274) size 592x48 [color=#000080]
         RenderText {#text} at (0,0) size 48x49
           text run at (0,0) width 48: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-02-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
index d1fddc7..59c450b 100644
--- a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x166
-  RenderBlock {HTML} at (0,0) size 800x166
-    RenderBody {BODY} at (8,16) size 784x142
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x165
+  RenderBlock {HTML} at (0,0) size 800x165
+    RenderBody {BODY} at (8,16) size 784x141
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 472x19
           text run at (0,0) width 472: "There should be a solid single uninterrupted smooth column of blue below."
-      RenderBlock {DIV} at (0,35) size 784x107 [color=#000080]
+      RenderBlock {DIV} at (0,34) size 784x107 [color=#000080]
         RenderBlock {DIV} at (0,0) size 784x32
           RenderText {#text} at (0,0) size 32x33
             text run at (0,0) width 32: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-03-f-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-03-f-a-expected.txt
index 7d41167..8470427 100644
--- a/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-03-f-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1507-c526-font-sz-03-f-a-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x169
-  RenderBlock {HTML} at (0,0) size 800x169
-    RenderBody {BODY} at (8,16) size 784x143
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x166
+  RenderBlock {HTML} at (0,0) size 800x166
+    RenderBody {BODY} at (8,16) size 784x140
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 293x19
           text run at (0,0) width 293: "The two boxes below should be the same size."
-      RenderBlock {DIV} at (0,35) size 784x108 [color=#000080]
-        RenderBlock {P} at (30,0) size 724x49
+      RenderBlock {DIV} at (0,34) size 784x106 [color=#000080]
+        RenderBlock {P} at (30,0) size 724x48
           RenderText {#text} at (0,0) size 48x49
             text run at (0,0) width 48: "x"
-        RenderBlock {P} at (30,59) size 724x49
+        RenderBlock {P} at (30,58) size 724x48
           RenderText {#text} at (0,0) size 48x49
             text run at (0,0) width 48: "x"
diff --git a/LayoutTests/platform/efl/css2.1/t1601-c547-indent-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1601-c547-indent-00-b-a-expected.txt
index 3f51a43..d473f87 100644
--- a/LayoutTests/platform/efl/css2.1/t1601-c547-indent-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1601-c547-indent-00-b-a-expected.txt
@@ -1,38 +1,38 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x299
-  RenderBlock {HTML} at (0,0) size 800x299
-    RenderBody {BODY} at (8,16) size 784x275
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x298
+  RenderBlock {HTML} at (0,0) size 800x298
+    RenderBody {BODY} at (8,16) size 784x274
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 380x19
           text run at (0,0) width 380: "There should be a tall solid unbroken column of blue below."
-      RenderBlock {DIV} at (0,35) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,34) size 432x24 [color=#0000FF]
         RenderText {#text} at (0,0) size 48x25
           text run at (0,0) width 48: " x"
-      RenderBlock {DIV} at (0,59) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,58) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,83) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,82) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,107) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,106) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,131) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,130) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,155) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,154) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,179) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,178) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,203) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,202) size 432x24 [color=#0000FF]
         RenderText {#text} at (31,0) size 24x25
           text run at (31,0) width 24: "x"
-      RenderBlock {DIV} at (0,227) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,226) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x25
           text run at (24,0) width 24: "x"
-      RenderBlock {DIV} at (0,251) size 432x24 [color=#0000FF]
+      RenderBlock {DIV} at (0,250) size 432x24 [color=#0000FF]
         RenderText {#text} at (0,0) size 48x25
           text run at (0,0) width 48: " x"
diff --git a/LayoutTests/platform/efl/css2.1/t1601-c547-indent-01-d-expected.txt b/LayoutTests/platform/efl/css2.1/t1601-c547-indent-01-d-expected.txt
index 73f8d33..f59f4d2 100644
--- a/LayoutTests/platform/efl/css2.1/t1601-c547-indent-01-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1601-c547-indent-01-d-expected.txt
@@ -1,32 +1,32 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x246
-  RenderBlock {HTML} at (0,0) size 800x246
-    RenderBody {BODY} at (8,16) size 784x222
-      RenderBlock {P} at (0,0) size 784x38 [bgcolor=#00FFFF]
-        RenderText {#text} at (392,0) size 751x38
+layer at (0,0) size 800x236
+  RenderBlock {HTML} at (0,0) size 800x236
+    RenderBody {BODY} at (8,16) size 784x212
+      RenderBlock {P} at (0,0) size 784x36 [bgcolor=#00FFFF]
+        RenderText {#text} at (392,0) size 751x37
           text run at (392,0) width 359: "The first line of this sentence should be indented halfway"
-          text run at (0,19) width 66: "across the "
-          text run at (66,19) width 415: "page, but the rest of it should be flush with the normal left margin "
-          text run at (481,19) width 74: "of the page."
-      RenderBlock {P} at (0,54) size 784x76 [bgcolor=#00FFFF]
+          text run at (0,18) width 66: "across the "
+          text run at (66,18) width 415: "page, but the rest of it should be flush with the normal left margin "
+          text run at (481,18) width 74: "of the page."
+      RenderBlock {P} at (0,52) size 784x72 [bgcolor=#00FFFF]
         RenderText {#text} at (80,0) size 211x19
           text run at (80,0) width 211: "Only the first line of this sentence"
         RenderBR {BR} at (291,0) size 0x19
-        RenderText {#text} at (0,19) size 123x19
-          text run at (0,19) width 123: "should be indented,"
-        RenderBR {BR} at (123,19) size 0x19
-        RenderText {#text} at (0,38) size 145x19
-          text run at (0,38) width 145: "the others should all be"
-        RenderBR {BR} at (145,38) size 0x19
+        RenderText {#text} at (0,18) size 123x19
+          text run at (0,18) width 123: "should be indented,"
+        RenderBR {BR} at (123,18) size 0x19
+        RenderText {#text} at (0,36) size 145x19
+          text run at (0,36) width 145: "the others should all be"
+        RenderBR {BR} at (145,36) size 0x19
         RenderInline {EM} at (0,0) size 113x19
-          RenderText {#text} at (0,57) size 113x19
-            text run at (0,57) width 113: "aligned on the left"
-        RenderText {#text} at (113,57) size 100x19
-          text run at (113,57) width 100: " of the window."
-      RenderBlock {DIV} at (0,146) size 196x76 [bgcolor=#00FFFF]
-        RenderText {#text} at (392,0) size 404x76
+          RenderText {#text} at (0,54) size 113x19
+            text run at (0,54) width 113: "aligned on the left"
+        RenderText {#text} at (113,54) size 100x19
+          text run at (113,54) width 100: " of the window."
+      RenderBlock {DIV} at (0,140) size 196x72 [bgcolor=#00FFFF]
+        RenderText {#text} at (392,0) size 404x73
           text run at (392,0) width 12: "X"
-          text run at (0,19) width 169: "The X on the previous line"
-          text run at (0,38) width 184: "should be centered across the"
-          text run at (0,57) width 56: "window."
+          text run at (0,18) width 169: "The X on the previous line"
+          text run at (0,36) width 184: "should be centered across the"
+          text run at (0,54) width 56: "window."
diff --git a/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
index 01e4bd11..d6b8f35 100644
--- a/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x104
-  RenderBlock {HTML} at (0,0) size 800x104
-    RenderBody {BODY} at (8,16) size 784x80
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x103
+  RenderBlock {HTML} at (0,0) size 800x103
+    RenderBody {BODY} at (8,16) size 784x79
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 413x19
           text run at (0,0) width 413: "There should be a single small column of blue below with no red:"
-      RenderBlock {DIV} at (0,35) size 784x15
+      RenderBlock {DIV} at (0,34) size 784x15
         RenderImage {IMG} at (384,0) size 15x15
-      RenderBlock {DIV} at (0,50) size 784x15
+      RenderBlock {DIV} at (0,49) size 784x15
         RenderImage {IMG} at (385,0) size 15x15
-      RenderBlock {DIV} at (0,65) size 784x15 [color=#0000FF]
+      RenderBlock {DIV} at (0,64) size 784x15 [color=#0000FF]
         RenderText {#text} at (384,0) size 16x15
           text run at (384,0) width 16: "X"
diff --git a/LayoutTests/platform/efl/css2.1/t1602-c546-txt-align-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1602-c546-txt-align-00-b-expected.txt
index ef19697..915b853 100644
--- a/LayoutTests/platform/efl/css2.1/t1602-c546-txt-align-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1602-c546-txt-align-00-b-expected.txt
@@ -1,55 +1,55 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x403
-  RenderBlock {HTML} at (0,0) size 800x403
-    RenderBody {BODY} at (8,16) size 784x371
-      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+layer at (0,0) size 800x386
+  RenderBlock {HTML} at (0,0) size 800x386
+    RenderBody {BODY} at (8,16) size 784x354
+      RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {#text} at (0,0) size 234x19
           text run at (0,0) width 234: "This sentence should be left-justified."
-      RenderBlock {P} at (0,35) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,34) size 784x18 [color=#000080]
         RenderText {#text} at (541,0) size 243x19
           text run at (541,0) width 243: "This sentence should be right-justified."
-      RenderBlock {P} at (0,70) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,68) size 784x18 [color=#000080]
         RenderText {#text} at (286,0) size 212x19
           text run at (286,0) width 212: "This sentence should be centered."
-      RenderBlock {P} at (0,105) size 784x266 [color=#000080]
+      RenderBlock {P} at (0,102) size 784x252 [color=#000080]
         RenderText {#text} at (0,0) size 496x19
           text run at (0,0) width 392: "This paragraph should be justified (the right and left margins "
           text run at (392,0) width 104: "should line up). "
-        RenderInline {SPAN} at (0,0) size 784x266 [color=#C0C0C0]
-          RenderText {#text} at (496,0) size 784x266
+        RenderInline {SPAN} at (0,0) size 784x253 [color=#C0C0C0]
+          RenderText {#text} at (496,0) size 784x253
             text run at (496,0) width 288: "This is just lovely dummy text. Dummy text."
-            text run at (0,19) width 56: "Dummy "
-            text run at (56,19) width 529: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (585,19) width 199: "This is just lovely dummy text."
-            text run at (0,38) width 349: "This is just lovely dummy text. Dummy text. Dummy "
-            text run at (349,38) width 435: "text. This is just lovely dummy text. This is just lovely dummy text."
-            text run at (0,57) width 88: "Dummy text. "
-            text run at (88,57) width 550: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
-            text run at (638,57) width 146: "text. This is just lovely"
-            text run at (0,76) width 379: "dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (379,76) width 405: "This is just lovely dummy text. This is just lovely dummy text."
-            text run at (0,95) width 145: "Dummy text. Dummy "
-            text run at (145,95) width 525: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (670,95) width 114: "This is just lovely"
-            text run at (0,114) width 434: "dummy text. This is just lovely dummy text. Dummy text. Dummy "
-            text run at (434,114) width 350: "text. This is just lovely dummy text. This is just lovely"
-            text run at (0,133) width 170: "dummy text. Dummy text. "
-            text run at (170,133) width 540: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
-            text run at (710,133) width 74: "text. This is"
-            text run at (0,152) width 458: "just lovely dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (458,152) width 326: "This is just lovely dummy text. This is just lovely"
-            text run at (0,171) width 226: "dummy text. Dummy text. Dummy "
-            text run at (226,171) width 515: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (741,171) width 43: "This is"
-            text run at (0,190) width 505: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
-            text run at (505,190) width 279: "text. This is just lovely dummy text. This is"
-            text run at (0,209) width 242: "just lovely dummy text. Dummy text. "
-            text run at (242,209) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy"
-            text run at (0,228) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
-            text run at (516,228) width 268: "This is just lovely dummy text. This is just"
-            text run at (0,247) width 269: "lovely dummy text. Dummy text. Dummy "
-            text run at (269,247) width 118: "text. Dummy text. "
-        RenderText {#text} at (387,247) size 381x19
-          text run at (387,247) width 260: "This sentence should be at the end of the "
-          text run at (647,247) width 121: "block, not justified."
+            text run at (0,18) width 56: "Dummy "
+            text run at (56,18) width 529: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (585,18) width 199: "This is just lovely dummy text."
+            text run at (0,36) width 349: "This is just lovely dummy text. Dummy text. Dummy "
+            text run at (349,36) width 435: "text. This is just lovely dummy text. This is just lovely dummy text."
+            text run at (0,54) width 88: "Dummy text. "
+            text run at (88,54) width 550: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
+            text run at (638,54) width 146: "text. This is just lovely"
+            text run at (0,72) width 379: "dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (379,72) width 405: "This is just lovely dummy text. This is just lovely dummy text."
+            text run at (0,90) width 145: "Dummy text. Dummy "
+            text run at (145,90) width 525: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (670,90) width 114: "This is just lovely"
+            text run at (0,108) width 434: "dummy text. This is just lovely dummy text. Dummy text. Dummy "
+            text run at (434,108) width 350: "text. This is just lovely dummy text. This is just lovely"
+            text run at (0,126) width 170: "dummy text. Dummy text. "
+            text run at (170,126) width 540: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
+            text run at (710,126) width 74: "text. This is"
+            text run at (0,144) width 458: "just lovely dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (458,144) width 326: "This is just lovely dummy text. This is just lovely"
+            text run at (0,162) width 226: "dummy text. Dummy text. Dummy "
+            text run at (226,162) width 515: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (741,162) width 43: "This is"
+            text run at (0,180) width 505: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
+            text run at (505,180) width 279: "text. This is just lovely dummy text. This is"
+            text run at (0,198) width 242: "just lovely dummy text. Dummy text. "
+            text run at (242,198) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy"
+            text run at (0,216) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
+            text run at (516,216) width 268: "This is just lovely dummy text. This is just"
+            text run at (0,234) width 269: "lovely dummy text. Dummy text. Dummy "
+            text run at (269,234) width 118: "text. Dummy text. "
+        RenderText {#text} at (387,234) size 381x19
+          text run at (387,234) width 260: "This sentence should be at the end of the "
+          text run at (647,234) width 121: "block, not justified."
diff --git a/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
index 2b082b71..4fd9c10 100644
--- a/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
@@ -1,41 +1,41 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x323
-  RenderBlock {HTML} at (0,0) size 800x323
-    RenderBody {BODY} at (8,16) size 784x299
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x322
+  RenderBlock {HTML} at (0,0) size 800x322
+    RenderBody {BODY} at (8,16) size 784x298
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 708x19
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
-      RenderBlock {DIV} at (0,35) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,34) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x  xx  xxx  xxxx"
-      RenderBlock {DIV} at (0,59) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,58) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x  xx  xxx  xxxx"
-      RenderBlock {DIV} at (0,83) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,82) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x  xx  xxx  xxxx"
-      RenderBlock {DIV} at (0,107) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,106) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,131) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,130) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,155) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,154) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,179) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,178) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,203) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,202) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,227) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,226) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,251) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,250) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 405x25
           text run at (0,0) width 405: "x xx xxx xxxx"
-      RenderBlock {DIV} at (0,275) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,274) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "x xx xxx xxxx"
diff --git a/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-01-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
index 812b07c..1ba7b00 100644
--- a/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
@@ -1,30 +1,30 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x203
-  RenderBlock {HTML} at (0,0) size 800x203
-    RenderBody {BODY} at (8,16) size 784x179
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x178
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 708x19
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
-      RenderBlock {DIV} at (48,35) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,34) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 264x25
           text run at (0,0) width 264: "x  x  xx xx"
-      RenderBlock {DIV} at (48,59) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,58) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 264x25
           text run at (0,0) width 264: "x  x  xx xx"
-      RenderBlock {DIV} at (48,83) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,82) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 264x25
           text run at (0,0) width 264: "x  x  xx xx"
-      RenderBlock {DIV} at (48,107) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,106) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 144x25
           text run at (0,0) width 144: "x x "
         RenderInline {SPAN} at (0,0) size 120x25
           RenderText {#text} at (144,0) size 120x25
             text run at (144,0) width 120: "xx xx"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (48,131) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,130) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 264x25
           text run at (0,0) width 264: "x  x  xx xx"
-      RenderBlock {DIV} at (48,155) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,154) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 264x25
           text run at (0,0) width 264: "x   x   xx  xx"
diff --git a/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
index 32e9074..2a034e1 100644
--- a/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
@@ -1,42 +1,42 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x347
-  RenderBlock {HTML} at (0,0) size 800x347
-    RenderBody {BODY} at (8,16) size 784x323
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x346
+  RenderBlock {HTML} at (0,0) size 800x346
+    RenderBody {BODY} at (8,16) size 784x322
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 708x19
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
-      RenderBlock {DIV} at (0,35) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,34) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 360x25
           text run at (0,0) width 360: "x x   x x   x x"
-      RenderBlock {DIV} at (0,59) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,58) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 360x25
           text run at (0,0) width 360: "x x   x x   x x"
-      RenderBlock {DIV} at (0,83) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,82) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 360x25
           text run at (0,0) width 360: "x x   x x   x x"
-      RenderBlock {DIV} at (0,107) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,106) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,131) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,130) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,155) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,154) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,179) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,178) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,203) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,202) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,227) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,226) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
-      RenderBlock {DIV} at (0,251) size 432x48 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,250) size 432x48 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 275x49
           text run at (0,0) width 275: "xx xx"
           text run at (0,24) width 110: "xx"
-      RenderBlock {DIV} at (0,299) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (0,298) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 384x25
           text run at (0,0) width 384: "xx xx xx"
diff --git a/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
index a82e86f..16cbabd 100644
--- a/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
@@ -1,30 +1,30 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x203
-  RenderBlock {HTML} at (0,0) size 800x203
-    RenderBody {BODY} at (8,16) size 784x179
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x178
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 708x19
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
-      RenderBlock {DIV} at (48,35) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,34) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 312x25
           text run at (0,0) width 312: "x  x    xx xx"
-      RenderBlock {DIV} at (48,59) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,58) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 312x25
           text run at (0,0) width 312: "x  x    xx xx"
-      RenderBlock {DIV} at (48,83) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,82) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 312x25
           text run at (0,0) width 312: "x  x    xx xx"
-      RenderBlock {DIV} at (48,107) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,106) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 216x25
           text run at (0,0) width 216: "xx "
         RenderInline {SPAN} at (0,0) size 120x25
           RenderText {#text} at (216,0) size 120x25
             text run at (216,0) width 120: "xx xx"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (48,131) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,130) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 312x25
           text run at (0,0) width 312: "x  x    xx xx"
-      RenderBlock {DIV} at (48,155) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+      RenderBlock {DIV} at (48,154) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {#text} at (0,0) size 300x25
           text run at (0,0) width 300: "x     x         x x   x x"
diff --git a/LayoutTests/platform/efl/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
index ae8189a..c254d9b 100644
--- a/LayoutTests/platform/efl/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x191
-  RenderBlock {HTML} at (0,0) size 800x191
-    RenderBody {BODY} at (8,8) size 784x175
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x190
+  RenderBlock {HTML} at (0,0) size 800x190
+    RenderBody {BODY} at (8,8) size 784x174
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 227x19
           text run at (0,0) width 227: "There should be a green box below."
-      RenderBlock {DIV} at (0,19) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,18) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {P} at (3,3) size 320x30
           RenderText {#text} at (0,0) size 230x10
             text run at (0,0) width 230: "Xx xx x. (x.x. XX) x x "
diff --git a/LayoutTests/platform/efl/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt
index e85034a..4552216 100644
--- a/LayoutTests/platform/efl/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x155
-  RenderBlock {HTML} at (0,0) size 800x155
-    RenderBody {BODY} at (8,16) size 784x131
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x154
+  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 279x19
           text run at (0,0) width 279: "There should be a single green block below."
-      RenderBlock {DIV} at (0,35) size 231x96 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+      RenderBlock {DIV} at (0,34) size 231x96 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {P} at (3,3) size 225x45
           RenderText {#text} at (0,0) size 165x45
             text run at (0,0) width 120: "x  x   x"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-00-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-00-d-expected.txt
index c4d3c47..3b89df6 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-00-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-00-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-01-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-01-d-expected.txt
index 4d7ed97..adcfc26 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-01-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-01-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 155x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 155x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 150x165
           RenderTableRow {TR} at (0,0) size 150x55
-            RenderTableCell {TD} at (0,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,15) size 50x24 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,16) size 50x23 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (100,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,55) size 150x55
-            RenderTableCell {TD} at (0,69) size 50x26 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 50x25 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,72) size 50x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,72) size 50x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (100,69) size 50x26 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,70) size 50x25 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 43x19
                 text run at (1,4) width 43: "double"
           RenderTableRow {TR} at (0,110) size 150x55
-            RenderTableCell {TD} at (0,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,126) size 50x23 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,126) size 50x22 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 43x19
                 text run at (4,1) width 43: "double"
-            RenderTableCell {TD} at (100,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-02-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-02-d-expected.txt
index 10beae8..6665f18 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-02-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-02-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 124x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 124x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 119x165
           RenderTableRow {TR} at (0,0) size 119x55
-            RenderTableCell {TD} at (0,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,15) size 45x24 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,16) size 45x23 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (82,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,55) size 119x55
-            RenderTableCell {TD} at (0,69) size 37x26 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 37x25 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,72) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,72) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (82,69) size 37x26 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,70) size 37x25 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 30x19
                 text run at (1,4) width 30: "solid"
           RenderTableRow {TR} at (0,110) size 119x55
-            RenderTableCell {TD} at (0,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,126) size 45x23 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,126) size 45x22 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 30x19
                 text run at (4,1) width 30: "solid"
-            RenderTableCell {TD} at (82,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-03-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-03-d-expected.txt
index b9d34b1..8013f0e 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-03-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-03-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x165
           RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,15) size 51x24 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,16) size 51x23 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (102,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,69) size 51x26 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 51x25 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,72) size 51x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,72) size 51x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (102,69) size 51x26 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,70) size 51x25 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 44x19
                 text run at (1,4) width 44: "dashed"
           RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,126) size 51x23 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,126) size 51x22 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 44x19
                 text run at (4,1) width 44: "dashed"
-            RenderTableCell {TD} at (102,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-04-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-04-d-expected.txt
index f34c486..8180988 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-04-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-04-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 143x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 143x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 138x165
           RenderTableRow {TR} at (0,0) size 138x55
-            RenderTableCell {TD} at (0,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,15) size 46x24 [border: (3px dotted #00FF00) none (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,16) size 46x23 [border: (3px dotted #00FF00) none (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (92,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,55) size 138x55
-            RenderTableCell {TD} at (0,69) size 46x26 [border: (3px dotted #00FF00) none (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 46x25 [border: (3px dotted #00FF00) none (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,72) size 46x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,72) size 46x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (92,69) size 46x26 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,70) size 46x25 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 39x19
                 text run at (1,4) width 39: "dotted"
           RenderTableRow {TR} at (0,110) size 138x55
-            RenderTableCell {TD} at (0,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,126) size 46x23 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,126) size 46x22 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 39x19
                 text run at (4,1) width 39: "dotted"
-            RenderTableCell {TD} at (92,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-05-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-05-d-expected.txt
index 84a49f0..073413d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-05-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-05-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 128x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 128x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 123x165
           RenderTableRow {TR} at (0,0) size 123x55
-            RenderTableCell {TD} at (0,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,15) size 45x24 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,16) size 45x23 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (84,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,55) size 123x55
-            RenderTableCell {TD} at (0,69) size 39x26 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 39x25 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,72) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,72) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (84,69) size 39x26 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,70) size 39x25 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 32x19
                 text run at (1,4) width 32: "ridge"
           RenderTableRow {TR} at (0,110) size 123x55
-            RenderTableCell {TD} at (0,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,126) size 45x23 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,126) size 45x22 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 32x19
                 text run at (4,1) width 32: "ridge"
-            RenderTableCell {TD} at (84,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-06-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-06-d-expected.txt
index f79c985..8553c95 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-06-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-06-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 138x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 138x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 133x165
           RenderTableRow {TR} at (0,0) size 133x55
-            RenderTableCell {TD} at (0,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,15) size 45x24 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,16) size 45x23 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (89,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,55) size 133x55
-            RenderTableCell {TD} at (0,69) size 44x26 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 44x25 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,72) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,72) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (89,69) size 44x26 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,70) size 44x25 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 37x19
                 text run at (1,4) width 37: "outset"
           RenderTableRow {TR} at (0,110) size 133x55
-            RenderTableCell {TD} at (0,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,126) size 45x23 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,126) size 45x22 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 37x19
                 text run at (4,1) width 37: "outset"
-            RenderTableCell {TD} at (89,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-07-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-07-d-expected.txt
index 5702b2b..e17f69b 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-07-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-07-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x165
           RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,15) size 51x24 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,16) size 51x23 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (102,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,69) size 51x26 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 51x25 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,72) size 51x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,72) size 51x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (102,69) size 51x26 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,70) size 51x25 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 44x19
                 text run at (1,4) width 44: "groove"
           RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,126) size 51x23 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,126) size 51x22 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 44x19
                 text run at (4,1) width 44: "groove"
-            RenderTableCell {TD} at (102,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-08-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-08-d-expected.txt
index a31969b..2f22e3d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-08-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-08-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 122x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 122x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 117x165
           RenderTableRow {TR} at (0,0) size 117x55
-            RenderTableCell {TD} at (0,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,15) size 45x24 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,16) size 45x23 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (81,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,55) size 117x55
-            RenderTableCell {TD} at (0,69) size 36x26 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 36x25 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,72) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,72) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (81,69) size 36x26 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,70) size 36x25 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,4) size 29x19
                 text run at (1,4) width 29: "inset"
           RenderTableRow {TR} at (0,110) size 117x55
-            RenderTableCell {TD} at (0,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,126) size 45x23 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,126) size 45x22 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,1) size 29x19
                 text run at (4,1) width 29: "inset"
-            RenderTableCell {TD} at (81,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
index eb6f746..ab8baf6 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 111x150
+      RenderTable {TABLE} at (0,34) size 111x150
         RenderTableSection {TBODY} at (0,0) size 111x150
           RenderTableRow {TR} at (0,0) size 111x50
-            RenderTableCell {TD} at (0,14) size 33x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 33x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (78,14) size 33x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,15) size 33x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,50) size 111x50
-            RenderTableCell {TD} at (0,64) size 33x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 33x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (78,64) size 33x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,65) size 33x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,100) size 111x50
-            RenderTableCell {TD} at (0,114) size 33x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 33x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (78,114) size 33x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,115) size 33x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-10-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-10-d-expected.txt
index b728f95..69ef433 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-10-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-10-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "double"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-11-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-11-d-expected.txt
index 58da98a..66db085 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-11-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-11-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 165x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 165x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 160x175
           RenderTableRow {TR} at (0,0) size 160x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 55x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 55x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (108,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (108,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 160x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (108,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (108,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 160x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 55x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 55x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (108,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (108,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-12-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-12-d-expected.txt
index d9e8616..2499d34 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-12-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-12-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 139x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 134x175
           RenderTableRow {TR} at (0,0) size 134x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 55x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 55x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (95,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 134x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (95,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 134x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 55x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 55x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (95,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-13-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-13-d-expected.txt
index 205ecbb..27442a2 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-13-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-13-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 167x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 167x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 162x175
           RenderTableRow {TR} at (0,0) size 162x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 55x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 55x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (109,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 162x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (109,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 162x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 55x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 55x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (109,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-14-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-14-d-expected.txt
index f902f77..c115eea 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-14-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-14-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 157x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 157x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 152x175
           RenderTableRow {TR} at (0,0) size 152x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 55x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 55x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (104,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 152x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (104,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 152x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 55x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 55x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (104,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-15-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-15-d-expected.txt
index 51ba740..9afd969 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-15-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-15-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 143x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 143x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 138x175
           RenderTableRow {TR} at (0,0) size 138x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 55x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 55x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (97,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (97,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 138x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (97,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (97,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 138x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 55x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 55x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (97,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (97,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-16-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-16-d-expected.txt
index eca7527c..05e4446 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-16-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-16-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 153x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 153x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 148x175
           RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 55x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 55x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (102,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (102,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 55x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 55x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (102,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-17-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-17-d-expected.txt
index 43cc929..77cb692 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-17-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-17-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 167x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 167x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 162x175
           RenderTableRow {TR} at (0,0) size 162x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 55x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 55x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (109,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 162x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (109,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 162x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 55x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 55x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (109,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
index e2a4ae8..6939787 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 137x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 137x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 132x175
           RenderTableRow {TR} at (0,0) size 132x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 55x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 55x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (94,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 132x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (94,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 132x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 55x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 55x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (94,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-19-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-19-d-expected.txt
index 83b4331..71dcfac 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-19-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-19-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 131x170
+      RenderTable {TABLE} at (0,34) size 131x170
         RenderTableSection {TBODY} at (0,0) size 131x170
           RenderTableRow {TR} at (0,0) size 131x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 55x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 55x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (93,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 131x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 43x19
                 text run at (6,6) width 43: "double"
-            RenderTableCell {TD} at (93,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 131x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 55x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 55x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (93,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-20-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-20-d-expected.txt
index d568786..f590905 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-20-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-20-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 30x19
                 text run at (1,1) width 30: "solid"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-21-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-21-d-expected.txt
index f01095d..449e08d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-21-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-21-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 155x175
           RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 50x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-22-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-22-d-expected.txt
index a21cbe3..04e2798 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-22-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-22-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 126x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 121x175
           RenderTableRow {TR} at (0,0) size 121x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 42x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 42x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (82,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 121x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (82,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 121x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 42x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 42x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (82,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-23-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-23-d-expected.txt
index 27c8b51..f1329ab 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-23-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-23-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-24-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-24-d-expected.txt
index d1b8ce6..0539c53 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-24-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-24-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 143x175
           RenderTableRow {TR} at (0,0) size 143x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 143x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 46x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 143x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-25-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-25-d-expected.txt
index ba429ce..68614a1 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-25-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-25-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 130x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 130x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 125x175
           RenderTableRow {TR} at (0,0) size 125x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 42x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (84,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 125x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (84,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 125x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 42x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 42x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (84,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-26-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-26-d-expected.txt
index 37c997a..854275a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-26-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-26-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 137x175
           RenderTableRow {TR} at (0,0) size 137x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 137x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 44x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 44x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 137x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-27-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-27-d-expected.txt
index f626edb..94ac260 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-27-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-27-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-28-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-28-d-expected.txt
index 0910b95..24a20be 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-28-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-28-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 124x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 124x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 119x175
           RenderTableRow {TR} at (0,0) size 119x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 42x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 42x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (81,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 119x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (81,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 119x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 42x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 42x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (81,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-29-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-29-d-expected.txt
index c88eab8..738034c 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-29-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-29-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 118x170
+      RenderTable {TABLE} at (0,34) size 118x170
         RenderTableSection {TBODY} at (0,0) size 118x170
           RenderTableRow {TR} at (0,0) size 118x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 42x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 42x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (80,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 118x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 42x31 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 30x19
                 text run at (6,6) width 30: "solid"
-            RenderTableCell {TD} at (80,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 118x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 42x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 42x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (80,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-30-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-30-d-expected.txt
index cc65eee..74fc83b 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-30-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-30-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 136x150
+      RenderTable {TABLE} at (0,34) size 136x150
         RenderTableSection {TBODY} at (0,0) size 136x150
           RenderTableRow {TR} at (0,0) size 136x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 46x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 46x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (91,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 136x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 46x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 46x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 44x19
                 text run at (1,1) width 44: "dashed"
-            RenderTableCell {TD} at (91,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 136x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 46x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 46x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (91,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-31-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-31-d-expected.txt
index 2b46f49..76e7f8d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-31-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-31-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 166x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 166x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 161x175
           RenderTableRow {TR} at (0,0) size 161x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 56x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 161x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 161x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 56x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 56x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (109,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-32-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-32-d-expected.txt
index ade8632..a588ad1 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-32-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-32-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 140x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 140x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 135x175
           RenderTableRow {TR} at (0,0) size 135x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 56x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 135x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 135x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 56x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 56x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (96,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-33-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-33-d-expected.txt
index 4c84114..3478fb2 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-33-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-33-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 163x175
           RenderTableRow {TR} at (0,0) size 163x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 56x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 163x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 163x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 56x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 56x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (110,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-34-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-34-d-expected.txt
index 013b633..943c75a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-34-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-34-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x175
           RenderTableRow {TR} at (0,0) size 153x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 56x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 153x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 153x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 56x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 56x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (105,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-35-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-35-d-expected.txt
index 02ebd52..308a58d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-35-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-35-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 144x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 144x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 139x175
           RenderTableRow {TR} at (0,0) size 139x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 56x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 139x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 139x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 56x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 56x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (98,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-36-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-36-d-expected.txt
index abc0ba6..7c9fcb8 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-36-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-36-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 154x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 149x175
           RenderTableRow {TR} at (0,0) size 149x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 56x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 149x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 149x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 56x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 56x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (103,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-37-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-37-d-expected.txt
index a9a70f9..51018fa 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-37-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-37-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 163x175
           RenderTableRow {TR} at (0,0) size 163x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 56x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 163x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 163x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 56x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 56x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (110,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-38-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-38-d-expected.txt
index d730738..72dcef8 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-38-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-38-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 138x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 138x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 133x175
           RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 56x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 56x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 56x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (95,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-39-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-39-d-expected.txt
index 103a3a6..352d1fe 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-39-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-39-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 132x170
+      RenderTable {TABLE} at (0,34) size 132x170
         RenderTableSection {TBODY} at (0,0) size 132x170
           RenderTableRow {TR} at (0,0) size 132x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 56x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 132x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 56x31 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "dashed"
-            RenderTableCell {TD} at (94,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 132x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 56x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 56x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-40-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-40-d-expected.txt
index caa3793..7d31619 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-40-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-40-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 39x19
                 text run at (1,1) width 39: "dotted"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-41-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-41-d-expected.txt
index d0993e8..b79aaca 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-41-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-41-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 161x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 161x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 156x175
           RenderTableRow {TR} at (0,0) size 156x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 51x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (104,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 156x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (104,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 156x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 51x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 51x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (104,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (104,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-42-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-42-d-expected.txt
index 89e6bdb..1027e3c 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-42-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-42-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 135x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 130x175
           RenderTableRow {TR} at (0,0) size 130x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 51x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 51x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (91,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 130x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (91,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 130x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 51x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 51x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (91,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-43-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-43-d-expected.txt
index 9607470..e6c0b2d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-43-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-43-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-44-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-44-d-expected.txt
index 18bc8c6..24815b7 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-44-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-44-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 153x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 153x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 148x175
           RenderTableRow {TR} at (0,0) size 148x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 51x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 51x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (100,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 148x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (100,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 148x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 51x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 51x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (100,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-45-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-45-d-expected.txt
index 1611471..60afe82 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-45-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-45-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 139x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 139x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 134x175
           RenderTableRow {TR} at (0,0) size 134x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 51x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 51x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (93,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 134x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (93,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 134x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 51x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 51x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (93,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (93,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-46-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-46-d-expected.txt
index 917b8af..0c58764 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-46-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-46-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 149x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 149x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 144x175
           RenderTableRow {TR} at (0,0) size 144x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 51x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 51x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (98,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 144x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (98,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 144x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 51x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 51x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (98,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-47-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-47-d-expected.txt
index f00f52e..c0b0e1d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-47-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-47-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-48-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-48-d-expected.txt
index a752cfe..c66a2b1 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-48-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-48-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 133x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 128x175
           RenderTableRow {TR} at (0,0) size 128x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 51x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 51x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (90,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 128x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (90,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 128x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 51x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 51x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (90,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-49-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-49-d-expected.txt
index f15096e..3e16e71 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-49-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-49-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 127x170
+      RenderTable {TABLE} at (0,34) size 127x170
         RenderTableSection {TBODY} at (0,0) size 127x170
           RenderTableRow {TR} at (0,0) size 127x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 51x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 51x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (89,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 127x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 51x31 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 39x19
                 text run at (6,6) width 39: "dotted"
-            RenderTableCell {TD} at (89,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 127x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 51x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 51x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (89,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-50-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-50-d-expected.txt
index aafa3a2..c8bc79e 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-50-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-50-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 32x19
                 text run at (1,1) width 32: "ridge"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-51-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-51-d-expected.txt
index e8b248d..cd33d7f 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-51-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-51-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 155x175
           RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 50x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-52-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-52-d-expected.txt
index 372756c..d1672e2 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-52-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-52-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 128x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 128x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 123x175
           RenderTableRow {TR} at (0,0) size 123x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 44x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (84,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 123x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (84,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 123x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 44x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 44x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (84,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (84,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-53-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-53-d-expected.txt
index 8ee1234..60749cc 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-53-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-53-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-54-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-54-d-expected.txt
index 21268a9..c18ff66 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-54-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-54-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 143x175
           RenderTableRow {TR} at (0,0) size 143x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 143x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 46x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 143x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-55-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-55-d-expected.txt
index a292921..ffec892 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-55-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-55-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 132x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 132x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 127x175
           RenderTableRow {TR} at (0,0) size 127x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 44x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 44x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (86,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (86,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 127x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (86,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (86,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 127x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 44x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 44x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (86,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (86,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-56-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-56-d-expected.txt
index 39facd6..b3948e9 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-56-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-56-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 137x175
           RenderTableRow {TR} at (0,0) size 137x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 137x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 137x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-57-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-57-d-expected.txt
index 3139aa5..76edaaf 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-57-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-57-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-58-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-58-d-expected.txt
index 5b5de78..7e573e8 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-58-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-58-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 126x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 126x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 121x175
           RenderTableRow {TR} at (0,0) size 121x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 44x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (83,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 121x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (83,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 121x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 44x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 44x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (83,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-59-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-59-d-expected.txt
index b275903..8cb0d23 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-59-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-59-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 120x170
+      RenderTable {TABLE} at (0,34) size 120x170
         RenderTableSection {TBODY} at (0,0) size 120x170
           RenderTableRow {TR} at (0,0) size 120x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 44x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 44x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (82,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 120x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 44x31 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 32x19
                 text run at (6,6) width 32: "ridge"
-            RenderTableCell {TD} at (82,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 120x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 44x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 44x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (82,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (82,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-60-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-60-d-expected.txt
index e7d3829..de6b681 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-60-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-60-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 37x19
                 text run at (1,1) width 37: "outset"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-61-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-61-d-expected.txt
index 0f1c30a..3a820fd 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-61-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-61-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 155x175
           RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 50x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-62-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-62-d-expected.txt
index 64b5595..094576d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-62-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-62-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 133x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 133x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 128x175
           RenderTableRow {TR} at (0,0) size 128x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 49x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 49x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (89,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 128x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (89,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 128x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 49x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 49x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (89,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (89,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-63-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-63-d-expected.txt
index 8c05be0..4905695 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-63-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-63-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-64-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-64-d-expected.txt
index 077de46..1c31bbd 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-64-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-64-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 151x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 151x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 146x175
           RenderTableRow {TR} at (0,0) size 146x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 49x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (98,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 146x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (98,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 146x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 49x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 49x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (98,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-65-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-65-d-expected.txt
index 44dcb41..cc9faa0 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-65-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-65-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 137x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 137x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 132x175
           RenderTableRow {TR} at (0,0) size 132x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 49x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 49x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (91,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 132x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (91,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 132x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 49x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 49x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (91,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-66-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-66-d-expected.txt
index 2ee55df..16f48dc 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-66-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-66-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 147x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 147x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 142x175
           RenderTableRow {TR} at (0,0) size 142x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 49x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 49x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (96,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 142x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (96,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 142x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 49x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 49x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (96,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-67-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-67-d-expected.txt
index 81b7e5b..154e4f0 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-67-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-67-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-68-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-68-d-expected.txt
index 6e81a7f..165e1f3 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-68-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-68-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 131x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 131x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 126x175
           RenderTableRow {TR} at (0,0) size 126x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 49x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 49x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (88,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 126x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (88,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 126x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 49x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 49x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (88,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
index 48a50a5..190d58a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 125x170
+      RenderTable {TABLE} at (0,34) size 125x170
         RenderTableSection {TBODY} at (0,0) size 125x170
           RenderTableRow {TR} at (0,0) size 125x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 49x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 49x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (87,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (87,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 125x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 37x19
                 text run at (6,6) width 37: "outset"
-            RenderTableCell {TD} at (87,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (87,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 125x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 49x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 49x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (87,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (87,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-70-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-70-d-expected.txt
index 00cfbf1..25fd001 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-70-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-70-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 136x150
+      RenderTable {TABLE} at (0,34) size 136x150
         RenderTableSection {TBODY} at (0,0) size 136x150
           RenderTableRow {TR} at (0,0) size 136x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 46x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 46x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (91,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 136x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 46x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 46x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 44x19
                 text run at (1,1) width 44: "groove"
-            RenderTableCell {TD} at (91,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 136x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 46x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 46x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (91,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-71-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-71-d-expected.txt
index d5a4766..b6a035a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-71-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-71-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 166x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 166x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 161x175
           RenderTableRow {TR} at (0,0) size 161x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 56x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 161x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 161x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 56x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 56x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (109,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (109,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-72-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-72-d-expected.txt
index 00461cd..2f5773c 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-72-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-72-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 140x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 140x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 135x175
           RenderTableRow {TR} at (0,0) size 135x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 56x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 135x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 135x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 56x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 56x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (96,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (96,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-73-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-73-d-expected.txt
index f3c47a9..a9a642e 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-73-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-73-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 163x175
           RenderTableRow {TR} at (0,0) size 163x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 56x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 163x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 163x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 56x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 56x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (110,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-74-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-74-d-expected.txt
index 9d52777..f9121b9 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-74-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-74-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x175
           RenderTableRow {TR} at (0,0) size 153x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 56x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 153x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 153x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 56x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 56x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (105,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-75-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-75-d-expected.txt
index 0c7f2cd..9253247 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-75-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-75-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 144x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 144x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 139x175
           RenderTableRow {TR} at (0,0) size 139x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 56x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 139x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 139x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 56x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 56x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (98,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (98,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-76-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-76-d-expected.txt
index c3f1d27..0c21f4d 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-76-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-76-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 154x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 154x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 149x175
           RenderTableRow {TR} at (0,0) size 149x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 56x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 149x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 149x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 56x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 56x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (103,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-77-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-77-d-expected.txt
index f670b5b..7cabc84 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-77-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-77-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 168x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 163x175
           RenderTableRow {TR} at (0,0) size 163x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 56x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 163x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 163x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 56x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 56x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (110,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (110,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-78-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-78-d-expected.txt
index 1658482..9af070f 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-78-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-78-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 138x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 138x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 133x175
           RenderTableRow {TR} at (0,0) size 133x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 56x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 133x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 133x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 56x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 56x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (95,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-79-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-79-d-expected.txt
index 26b3670..85ae298 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-79-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-79-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 132x170
+      RenderTable {TABLE} at (0,34) size 132x170
         RenderTableSection {TBODY} at (0,0) size 132x170
           RenderTableRow {TR} at (0,0) size 132x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 56x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 132x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 56x31 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 44x19
                 text run at (6,6) width 44: "groove"
-            RenderTableCell {TD} at (94,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 132x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 56x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 56x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (94,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
index a45ef42..7aa2429 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 29x19
                 text run at (1,1) width 29: "inset"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-81-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-81-d-expected.txt
index e4ac14c..4a1b793 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-81-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-81-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 160x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 155x175
           RenderTableRow {TR} at (0,0) size 155x58
-            RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 53x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,14) size 50x29 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,16) size 52x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,58) size 155x60
-            RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 53x25 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,72) size 50x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,73) size 50x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,75) size 52x25 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 43x19
                 text run at (6,4) width 43: "double"
           RenderTableRow {TR} at (0,118) size 155x57
-            RenderTableCell {TD} at (0,133) size 53x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (53,132) size 50x28 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 43x19
                 text run at (4,6) width 43: "double"
-            RenderTableCell {TD} at (103,133) size 52x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-82-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-82-d-expected.txt
index 181a7e2..e7d8ced 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-82-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-82-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 125x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 125x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 120x175
           RenderTableRow {TR} at (0,0) size 120x58
-            RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 40x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,14) size 41x29 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,15) size 41x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (81,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,16) size 39x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,58) size 120x60
-            RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 40x25 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (81,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,75) size 39x25 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 30x19
                 text run at (6,4) width 30: "solid"
           RenderTableRow {TR} at (0,118) size 120x57
-            RenderTableCell {TD} at (0,133) size 40x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (40,132) size 41x28 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (40,133) size 41x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 30x19
                 text run at (4,6) width 30: "solid"
-            RenderTableCell {TD} at (81,133) size 39x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (81,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-83-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-83-d-expected.txt
index 96bedc9..f250aad 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-83-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-83-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "dashed"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "dashed"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-84-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-84-d-expected.txt
index a260777..825b3d5 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-84-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-84-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 148x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 143x175
           RenderTableRow {TR} at (0,0) size 143x58
-            RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 49x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,14) size 46x29 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,16) size 48x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,58) size 143x60
-            RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 49x25 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,72) size 46x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,73) size 46x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,75) size 48x25 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 39x19
                 text run at (6,4) width 39: "dotted"
           RenderTableRow {TR} at (0,118) size 143x57
-            RenderTableCell {TD} at (0,133) size 49x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (49,132) size 46x28 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 39x19
                 text run at (4,6) width 39: "dotted"
-            RenderTableCell {TD} at (95,133) size 48x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-85-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-85-d-expected.txt
index c959ce7..98ce258 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-85-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-85-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 129x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 129x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 124x175
           RenderTableRow {TR} at (0,0) size 124x58
-            RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 42x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,14) size 41x29 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,15) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (83,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,16) size 41x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,58) size 124x60
-            RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 42x25 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (83,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,75) size 41x25 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 32x19
                 text run at (6,4) width 32: "ridge"
           RenderTableRow {TR} at (0,118) size 124x57
-            RenderTableCell {TD} at (0,133) size 42x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (42,132) size 41x28 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (42,133) size 41x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 32x19
                 text run at (4,6) width 32: "ridge"
-            RenderTableCell {TD} at (83,133) size 41x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (83,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
index 6520ac0..472f977 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 142x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 137x175
           RenderTableRow {TR} at (0,0) size 137x58
-            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 47x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,16) size 46x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,58) size 137x60
-            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 47x25 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,72) size 44x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,73) size 44x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,75) size 46x25 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 37x19
                 text run at (6,4) width 37: "outset"
           RenderTableRow {TR} at (0,118) size 137x57
-            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 37x19
                 text run at (4,6) width 37: "outset"
-            RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-87-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-87-d-expected.txt
index 0df1486..acd43df 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-87-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-87-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 163x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 158x175
           RenderTableRow {TR} at (0,0) size 158x58
-            RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 54x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,14) size 51x29 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,16) size 53x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,58) size 158x60
-            RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 54x25 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,72) size 51x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,73) size 51x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,75) size 53x25 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 44x19
                 text run at (6,4) width 44: "groove"
           RenderTableRow {TR} at (0,118) size 158x57
-            RenderTableCell {TD} at (0,133) size 54x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (54,132) size 51x28 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 44x19
                 text run at (4,6) width 44: "groove"
-            RenderTableCell {TD} at (105,133) size 53x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-88-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-88-d-expected.txt
index f838fe6..32489e5 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-88-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-88-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x239
-  RenderBlock {HTML} at (0,0) size 800x239
-    RenderBody {BODY} at (8,16) size 784x215
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x238
+  RenderBlock {HTML} at (0,0) size 800x238
+    RenderBody {BODY} at (8,16) size 784x214
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 123x180 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 123x180 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 118x175
           RenderTableRow {TR} at (0,0) size 118x58
-            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,16) size 39x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,14) size 41x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 41x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (80,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,16) size 38x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,58) size 118x60
-            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 39x25 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,72) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (80,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,75) size 38x25 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,4) size 29x19
                 text run at (6,4) width 29: "inset"
           RenderTableRow {TR} at (0,118) size 118x57
-            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (39,132) size 41x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,133) size 41x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,6) size 29x19
                 text run at (4,6) width 29: "inset"
-            RenderTableCell {TD} at (80,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (80,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-89-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-89-d-expected.txt
index 42d7160..51d13bc 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-89-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-89-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 117x170
+      RenderTable {TABLE} at (0,34) size 117x170
         RenderTableSection {TBODY} at (0,0) size 117x170
           RenderTableRow {TR} at (0,0) size 117x55
-            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,17) size 38x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,14) size 41x26 [border: none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,15) size 41x25 [border: none] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (79,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (79,17) size 38x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,55) size 117x60
-            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,69) size 41x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,70) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (6,6) size 29x19
                 text run at (6,6) width 29: "inset"
-            RenderTableCell {TD} at (79,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (79,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (6,1) size 31x19
                 text run at (6,1) width 31: "none"
           RenderTableRow {TR} at (0,115) size 117x55
-            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,132) size 38x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (38,129) size 41x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (38,130) size 41x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,6) size 31x19
                 text run at (1,6) width 31: "none"
-            RenderTableCell {TD} at (79,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (79,132) size 38x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-90-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-90-d-expected.txt
index c2ba2f8..893ca8f 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-90-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-90-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 135x150
+      RenderTable {TABLE} at (0,34) size 135x150
         RenderTableSection {TBODY} at (0,0) size 135x150
           RenderTableRow {TR} at (0,0) size 135x50
-            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,50) size 135x50
-            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
           RenderTableRow {TR} at (0,100) size 135x50
-            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
-            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 43x19
                 text run at (1,1) width 43: "hidden"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-91-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-91-d-expected.txt
index 7866bc9..12d2ea3 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-91-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-91-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 155x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 155x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 150x165
           RenderTableRow {TR} at (0,0) size 150x55
-            RenderTableCell {TD} at (0,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (100,14) size 50x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,55) size 150x55
-            RenderTableCell {TD} at (0,69) size 50x26 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 50x25 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,69) size 50x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,70) size 50x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (100,69) size 50x26 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,70) size 50x25 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
           RenderTableRow {TR} at (0,110) size 150x55
-            RenderTableCell {TD} at (0,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (50,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (50,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
-            RenderTableCell {TD} at (100,124) size 50x26 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (100,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 43x19
                 text run at (4,4) width 43: "double"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-92-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-92-d-expected.txt
index 785dfb6..f42de8a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-92-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-92-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 117x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 117x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 112x165
           RenderTableRow {TR} at (0,0) size 112x55
-            RenderTableCell {TD} at (0,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,14) size 38x26 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,15) size 38x25 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (75,14) size 37x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (75,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,55) size 112x55
-            RenderTableCell {TD} at (0,69) size 37x26 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 37x25 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,69) size 38x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,70) size 38x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (75,69) size 37x26 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (75,70) size 37x25 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
           RenderTableRow {TR} at (0,110) size 112x55
-            RenderTableCell {TD} at (0,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (37,124) size 38x26 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (37,125) size 38x25 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
-            RenderTableCell {TD} at (75,124) size 37x26 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (75,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 30x19
                 text run at (4,4) width 30: "solid"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-93-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-93-d-expected.txt
index 0299995..77556dc 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-93-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-93-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x165
           RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (102,14) size 51x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,69) size 51x26 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 51x25 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,69) size 51x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,70) size 51x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (102,69) size 51x26 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,70) size 51x25 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
           RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (51,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
-            RenderTableCell {TD} at (102,124) size 51x26 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "dashed"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-94-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-94-d-expected.txt
index 770a619..c0ac08a 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-94-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-94-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 143x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 143x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 138x165
           RenderTableRow {TR} at (0,0) size 138x55
-            RenderTableCell {TD} at (0,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (92,14) size 46x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,55) size 138x55
-            RenderTableCell {TD} at (0,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 46x25 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,69) size 46x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,70) size 46x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (92,69) size 46x26 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,70) size 46x25 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
           RenderTableRow {TR} at (0,110) size 138x55
-            RenderTableCell {TD} at (0,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (46,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (46,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
-            RenderTableCell {TD} at (92,124) size 46x26 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (92,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 39x19
                 text run at (4,4) width 39: "dotted"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-95-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-95-d-expected.txt
index 2715cbf..0d32fde 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-95-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-95-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 122x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 122x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 117x165
           RenderTableRow {TR} at (0,0) size 117x55
-            RenderTableCell {TD} at (0,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (78,14) size 39x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,55) size 117x55
-            RenderTableCell {TD} at (0,69) size 39x26 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 39x25 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,69) size 39x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,70) size 39x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (78,69) size 39x26 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,70) size 39x25 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,110) size 117x55
-            RenderTableCell {TD} at (0,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (39,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (39,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
-            RenderTableCell {TD} at (78,124) size 39x26 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (78,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 32x19
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-96-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-96-d-expected.txt
index d652238..fcee277 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-96-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-96-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 137x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 137x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 132x165
           RenderTableRow {TR} at (0,0) size 132x55
-            RenderTableCell {TD} at (0,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (88,14) size 44x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,55) size 132x55
-            RenderTableCell {TD} at (0,69) size 44x26 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 44x25 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,69) size 44x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,70) size 44x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (88,69) size 44x26 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,70) size 44x25 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,110) size 132x55
-            RenderTableCell {TD} at (0,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (44,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (44,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
-            RenderTableCell {TD} at (88,124) size 44x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (88,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 37x19
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-97-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
index e549b2c..d548ff1 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-97-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 158x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 153x165
           RenderTableRow {TR} at (0,0) size 153x55
-            RenderTableCell {TD} at (0,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (102,14) size 51x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,55) size 153x55
-            RenderTableCell {TD} at (0,69) size 51x26 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 51x25 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,69) size 51x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,70) size 51x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (102,69) size 51x26 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,70) size 51x25 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
           RenderTableRow {TR} at (0,110) size 153x55
-            RenderTableCell {TD} at (0,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (51,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (51,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
-            RenderTableCell {TD} at (102,124) size 51x26 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (102,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 44x19
                 text run at (4,4) width 44: "groove"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-98-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-98-d-expected.txt
index 136f29c..7b7cc4c 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-98-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-98-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x229
-  RenderBlock {HTML} at (0,0) size 800x229
-    RenderBody {BODY} at (8,16) size 784x205
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,16) size 784x204
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 115x170 [border: (2px none #808080)]
+      RenderTable {TABLE} at (0,34) size 115x170 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 110x165
           RenderTableRow {TR} at (0,0) size 110x55
-            RenderTableCell {TD} at (0,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,14) size 38x26 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,15) size 38x25 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (74,14) size 36x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (74,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,55) size 110x55
-            RenderTableCell {TD} at (0,69) size 36x26 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,70) size 36x25 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,69) size 38x26 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,70) size 38x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 31x19
                 text run at (4,4) width 31: "none"
-            RenderTableCell {TD} at (74,69) size 36x26 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (74,70) size 36x25 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
           RenderTableRow {TR} at (0,110) size 110x55
-            RenderTableCell {TD} at (0,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (36,124) size 38x26 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (36,125) size 38x25 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
-            RenderTableCell {TD} at (74,124) size 36x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (74,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 29x19
                 text run at (4,4) width 29: "inset"
diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-99-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-99-d-expected.txt
index 0d2c50b..bc026d6 100644
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-99-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-99-d-expected.txt
@@ -1,40 +1,40 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x209
-  RenderBlock {HTML} at (0,0) size 800x209
-    RenderBody {BODY} at (8,16) size 784x185
-      RenderBlock {P} at (0,0) size 784x19
+layer at (0,0) size 800x208
+  RenderBlock {HTML} at (0,0) size 800x208
+    RenderBody {BODY} at (8,16) size 784x184
+      RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 317x19
           text run at (0,0) width 317: "There should be no red borders on the table below"
-      RenderTable {TABLE} at (0,35) size 99x150
+      RenderTable {TABLE} at (0,34) size 99x150
         RenderTableSection {TBODY} at (0,0) size 99x150
           RenderTableRow {TR} at (0,0) size 99x50
-            RenderTableCell {TD} at (0,14) size 33x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,15) size 33x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,14) size 33x21 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,15) size 33x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (66,14) size 33x21 [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (66,15) size 33x20 [r=0 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,50) size 99x50
-            RenderTableCell {TD} at (0,64) size 33x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,65) size 33x20 [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,64) size 33x21 [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,65) size 33x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (66,64) size 33x21 [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (66,65) size 33x20 [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
           RenderTableRow {TR} at (0,100) size 99x50
-            RenderTableCell {TD} at (0,114) size 33x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (0,115) size 33x20 [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (33,114) size 33x21 [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (33,115) size 33x20 [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"
-            RenderTableCell {TD} at (66,114) size 33x21 [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (66,115) size 33x20 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 31x19
                 text run at (1,1) width 31: "none"