Rubber-stamped by Sam Weinig.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Jan 2010 02:59:21 +0000 (02:59 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Jan 2010 02:59:21 +0000 (02:59 +0000)
commit1347c9f63d30b57ec4e26fba72fa40567614aedc
treebec3ba79c63e7da8d6c056d1d2db110156083b0c
parentadd8ed48c715c667053f21b426d0d75453646ff9
Rubber-stamped by Sam Weinig.

<rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change

WebCore:

Reverted r49567.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::computeLogicalBoxHeights):
* rendering/RenderBR.cpp:
(WebCore::RenderBR::lineHeight):
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::computedLineHeight):

LayoutTests:

Reverted r49567, but left in the test added in that revision, now with a failing result.

* css1/font_properties/font.html:
* fast/css/line-height-rounding-expected.txt:
* platform/mac/css1/font_properties/font-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt:
* platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum:
* platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
* platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
* platform/mac/svg/custom/svg-fonts-in-html-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@53450 268f45cc-cd09-0410-ab3c-d52691b4dbfc
17 files changed:
LayoutTests/ChangeLog
LayoutTests/css1/font_properties/font.html
LayoutTests/fast/css/line-height-rounding-expected.txt
LayoutTests/platform/mac/css1/font_properties/font-expected.txt
LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt
LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt
LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt
LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum
LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum
LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
WebCore/ChangeLog
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/rendering/InlineFlowBox.cpp
WebCore/rendering/RenderBR.cpp
WebCore/rendering/style/RenderStyle.h