Changeset 175926 in webkit

Timestamp:

Nov 11, 2014, 7:52:08 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175363 - ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
​https://bugs.webkit.org/show_bug.cgi?id=138054.

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2014-10-29
Reviewed by Zalan Bujtas.

Source/WebCore:

A Length of type 'Calculated' can be generated from blending two lengths of
different types. Setting the wordSpacing of the render style should be handled
correctly when the type of the new value is 'Calculated'.

Tests: css3/calculated-word-spacing.html.

Add a case for setting the render style wordSpacing to a <length> of type 'Calculated'.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::setWordSpacing):

LayoutTests:

Ensure the render style's wordSpacing can be set correctly when the type of
the new value is 'Calculated'. The 'Calculated' Length value can result from
blending two Length values of different types. And these two Length values
are defined in two consecutive css animation key frames.

• css3/calculated-word-spacing-expected.txt: Added.
• css3/calculated-word-spacing.html: Added.

Location:

releases/WebKitGTK/webkit-2.6

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calculated-word-spacing-expected.txt (added)
• LayoutTests/css3/calculated-word-spacing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog

@@ +1 @@
+2014-10-29  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
+        https://bugs.webkit.org/show_bug.cgi?id=138054.
+
+        Reviewed by Zalan Bujtas.
+
+        Ensure the render style's wordSpacing can be set correctly when the type of
+        the new value is 'Calculated'. The 'Calculated' Length value can result from
+        blending two Length values of different types. And these two Length values
+        are defined in two consecutive css animation key frames.
+        
+        * css3/calculated-word-spacing-expected.txt: Added.
+        * css3/calculated-word-spacing.html: Added.
+
 2014-10-24  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-29  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
+        https://bugs.webkit.org/show_bug.cgi?id=138054.
+
+        Reviewed by Zalan Bujtas.
+
+        A Length of type 'Calculated' can be generated from blending two lengths of
+        different types. Setting the wordSpacing of the render style should be handled
+        correctly when the type of the new value is 'Calculated'.
+
+        Tests: css3/calculated-word-spacing.html.
+
+        Add a case for setting the render style wordSpacing to a <length> of type 'Calculated'.
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::setWordSpacing):
+
 2014-10-24  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -1380 +1380 @@
         fontWordSpacing = value.value();
         break;
+    case Calculated:
+        fontWordSpacing = value.nonNanCalculatedValue(maxValueForCssLength);
+        break;
     default:
         ASSERT_NOT_REACHED();