Changeset 18824 in webkit

Timestamp:

Jan 12, 2007 8:22:02 PM (17 years ago)

Author:

ddkilzer

Message:

LayoutTests:

Reviewed by Maciej.

• test for fast/css/line-height.html REGRESSION (r18816-r18818): Assertion failure in WebCore::Length::Length[in-charge](int, WebCore::LengthType, bool)

• fast/css/line-height-expected.checksum: Added.
• fast/css/line-height-expected.png: Added.
• fast/css/line-height-expected.txt: Added.
• fast/css/line-height.html: Added.

WebCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12239 REGRESSION (r18816-r18818): Assertion failure in WebCore::Length::Length[in-charge](int, WebCore::LengthType, bool)

Test: fast/css/line-height.html

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::createInnerTextStyle): Use a float to create a percent Length.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/line-height-expected.checksum (added)
• LayoutTests/fast/css/line-height-expected.png (added)
• LayoutTests/fast/css/line-height-expected.txt (added)
• LayoutTests/fast/css/line-height.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-12  David Kilzer  <ddkilzer@kilzer.net>
+
+        Reviewed by Maciej.
+
+        - test for fast/css/line-height.html
+          REGRESSION (r18816-r18818): Assertion failure in
+          WebCore::Length::Length[in-charge](int, WebCore::LengthType, bool)
+
+        * fast/css/line-height-expected.checksum: Added.
+        * fast/css/line-height-expected.png: Added.
+        * fast/css/line-height-expected.txt: Added.
+        * fast/css/line-height.html: Added.
+
 2007-01-12  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-12  David Kilzer  <ddkilzer@kilzer.net>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12239
+          REGRESSION (r18816-r18818): Assertion failure in 
+          WebCore::Length::Length[in-charge](int, WebCore::LengthType, bool)
+
+        Test: fast/css/line-height.html
+
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::createInnerTextStyle): Use a float to create a percent Length.
+
 2007-01-12  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -153 +153 @@
         // Do not allow line-height to be smaller than our default.
         if (textBlockStyle->font().lineSpacing() > lineHeight(true, true))
-            textBlockStyle->setLineHeight(Length(-100, Percent));
+            textBlockStyle->setLineHeight(Length(-100.0f, Percent));
     }