Changeset 145450 in webkit

Timestamp:

Mar 11, 2013 6:10:35 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[css3-text] Add partial parsing support for text-underline-position property from CSS3 Text
​https://bugs.webkit.org/show_bug.cgi?id=102491

Patch by Lamarque V. Souza <​Lamarque.Souza@basyskom.com> on 2013-03-11
Reviewed by Julien Chaffraix.

Source/WebCore:

This patch extends the existing parsing to support 'auto', 'alphabetic' and 'under'. We don't fully match
the specification as we don't support [ left | right ] and this is left for another implementation
as the rendering will need to be added.

Test: fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseTextUnderlinePosition):

• css/CSSParser.h:
• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator TextUnderlinePosition):

• css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):
Added parsing-related checks for text-underline-position property.

• css/CSSPropertyNames.in: Added '-webkit-underline-position' property.
• css/CSSValueKeywords.in:
• css/SVGCSSValueKeywords.in:
• css/StyleBuilder.cpp:

(ApplyPropertyTextUnderlinePosition):
(WebCore::ApplyPropertyTextUnderlinePosition::applyValue):
(WebCore::ApplyPropertyTextUnderlinePosition::createHandler):
(WebCore::StyleBuilder::StyleBuilder):
Set property handler for text-underline-position.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

• rendering/style/RenderStyle.h:
• rendering/style/RenderStyleConstants.h:
• rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
Added support for m_textUnderlinePosition on copy constructor and operator
assignment functions.

• rendering/style/StyleRareInheritedData.h:

(StyleRareInheritedData): Added m_textUnderlinePosition here as it won't be used regularly.

LayoutTests:

Added getComputedStyle layout tests for 'text-underline-position' CSS3
property, with 'webkit' prefix.

• fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt: Added.
• fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html: Added.
• fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js: Added.

(testElementStyle):
(testComputedStyle):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt (added)
• LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html (added)
• LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)
• Source/WebCore/css/CSSPrimitiveValueMappings.h (modified) (1 diff)
• Source/WebCore/css/CSSProperty.cpp (modified) (1 diff)
• Source/WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• Source/WebCore/css/CSSValueKeywords.in (modified) (1 diff)
• Source/WebCore/css/SVGCSSValueKeywords.in (modified) (1 diff)
• Source/WebCore/css/StyleBuilder.cpp (modified) (2 diffs)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (3 diffs)
• Source/WebCore/rendering/style/RenderStyleConstants.h (modified) (1 diff)
• Source/WebCore/rendering/style/StyleRareInheritedData.cpp (modified) (3 diffs)
• Source/WebCore/rendering/style/StyleRareInheritedData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-11  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
+
+        [css3-text] Add partial parsing support for text-underline-position property from CSS3 Text
+        https://bugs.webkit.org/show_bug.cgi?id=102491
+
+        Reviewed by Julien Chaffraix.
+
+        Added getComputedStyle layout tests for 'text-underline-position' CSS3
+        property, with 'webkit' prefix.
+
+        * fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt: Added.
+        * fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html: Added.
+        * fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js: Added.
+        (testElementStyle):
+        (testComputedStyle):
+
 2013-03-11  Christian Biesinger  <cbiesinger@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
+
+        [css3-text] Add partial parsing support for text-underline-position property from CSS3 Text
+        https://bugs.webkit.org/show_bug.cgi?id=102491
+
+        Reviewed by Julien Chaffraix.
+
+        This patch extends the existing parsing to support 'auto', 'alphabetic' and 'under'. We don't fully match
+        the specification as we don't support [ left | right ] and this is left for another implementation
+        as the rendering will need to be added.
+
+        Test: fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseTextUnderlinePosition):
+        * css/CSSParser.h:
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator TextUnderlinePosition):
+        * css/CSSProperty.cpp:
+        (WebCore::CSSProperty::isInheritedProperty):
+        Added parsing-related checks for text-underline-position property.
+        * css/CSSPropertyNames.in: Added '-webkit-underline-position' property.
+        * css/CSSValueKeywords.in:
+        * css/SVGCSSValueKeywords.in:
+        * css/StyleBuilder.cpp:
+        (ApplyPropertyTextUnderlinePosition):
+        (WebCore::ApplyPropertyTextUnderlinePosition::applyValue):
+        (WebCore::ApplyPropertyTextUnderlinePosition::createHandler):
+        (WebCore::StyleBuilder::StyleBuilder):
+        Set property handler for text-underline-position.
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+        * rendering/style/RenderStyle.h:
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/StyleRareInheritedData.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+        (WebCore::StyleRareInheritedData::operator==):
+        Added support for m_textUnderlinePosition on copy constructor and operator
+        assignment functions.
+        * rendering/style/StyleRareInheritedData.h:
+        (StyleRareInheritedData): Added m_textUnderlinePosition here as it won't be used regularly.
+
 2013-03-11  Christian Biesinger  <cbiesinger@chromium.org>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -192 +192 @@
     CSSPropertyWebkitTextDecorationStyle,
     CSSPropertyWebkitTextAlignLast,
+    CSSPropertyWebkitTextUnderlinePosition,
 #endif // CSS3_TEXT
     CSSPropertyTextIndent,
@@ -2156 +2157 @@
         case CSSPropertyWebkitTextAlignLast:
             return cssValuePool().createValue(style->textAlignLast());
+        case CSSPropertyWebkitTextUnderlinePosition:
+            return cssValuePool().createValue(style->textUnderlinePosition());
 #endif // CSS3_TEXT
         case CSSPropertyWebkitTextDecorationsInEffect:

trunk/Source/WebCore/css/CSSParser.cpp

@@ -2297 +2297 @@
             validPrimitive = true;
         break;
+
+    case CSSPropertyWebkitTextUnderlinePosition:
+        // auto | alphabetic | under
+        return parseTextUnderlinePosition(important);
 #endif // CSS3_TEXT
 
@@ -9142 +9146 @@
 }
 
+#if ENABLE(CSS3_TEXT)
+bool CSSParser::parseTextUnderlinePosition(bool important)
+{
+    // The text-underline-position property has sintax "auto | alphabetic | [ under || [ left | right ] ]".
+    // However, values 'left' and 'right' are not implemented yet, so we will parse sintax
+    // "auto | alphabetic | under" for now.
+    CSSParserValue* value = m_valueList->current();
+    switch (value->id) {
+    case CSSValueAuto:
+    case CSSValueAlphabetic:
+    case CSSValueUnder:
+        if (m_valueList->next())
+            return false;
+
+        addProperty(CSSPropertyWebkitTextUnderlinePosition, cssValuePool().createIdentifierValue(value->id), important);
+        return true;
+    }
+    return false;
+}
+#endif // CSS3_TEXT
+
 bool CSSParser::parseTextEmphasisStyle(bool important)
 {

trunk/Source/WebCore/css/CSSParser.h

@@ -265 +265 @@
     void addTextDecorationProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important);
     bool parseTextDecoration(CSSPropertyID propId, bool important);
+#if ENABLE(CSS3_TEXT)
+    bool parseTextUnderlinePosition(bool important);
+#endif // CSS3_TEXT
 
     bool parseLineBoxContain(bool important);

trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

@@ -2397 +2397 @@
     ASSERT_NOT_REACHED();
     return TextDecorationStyleSolid;
+}
+
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e)
+    : CSSValue(PrimitiveClass)
+{
+    m_primitiveUnitType = CSS_IDENT;
+    switch (e) {
+    case TextUnderlinePositionAuto:
+        m_value.ident = CSSValueAuto;
+        break;
+    case TextUnderlinePositionAlphabetic:
+        m_value.ident = CSSValueAlphabetic;
+        break;
+    case TextUnderlinePositionUnder:
+        m_value.ident = CSSValueUnder;
+        break;
+    }
+
+    // FIXME: Implement support for 'under left' and 'under right' values.
+}
+
+template<> inline CSSPrimitiveValue::operator TextUnderlinePosition() const
+{
+    switch (m_value.ident) {
+    case CSSValueAuto:
+        return TextUnderlinePositionAuto;
+    case CSSValueAlphabetic:
+        return TextUnderlinePositionAlphabetic;
+    case CSSValueUnder:
+        return TextUnderlinePositionUnder;
+    }
+
+    // FIXME: Implement support for 'under left' and 'under right' values.
+
+    ASSERT_NOT_REACHED();
+    return TextUnderlinePositionAuto;
 }
 #endif // CSS3_TEXT

trunk/Source/WebCore/css/CSSProperty.cpp

@@ -333 +333 @@
     case CSSPropertyWebkitTextDecorationLine:
     case CSSPropertyWebkitTextAlignLast:
+    case CSSPropertyWebkitTextUnderlinePosition:
 #endif // CSS3_TEXT
     case CSSPropertyWebkitTextDecorationsInEffect:

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -373 +373 @@
 -webkit-text-decoration-style
 -webkit-text-align-last
+-webkit-text-underline-position
 #endif
 -webkit-text-decorations-in-effect

trunk/Source/WebCore/css/CSSValueKeywords.in

@@ -953 +953 @@
 edges
 
+#if (defined(ENABLE_SVG) && ENABLE_SVG) || (defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT)
+alphabetic
+#endif
+
 // position
 #if defined(ENABLE_CSS_STICKY_POSITION) && ENABLE_CSS_STICKY_POSITION

trunk/Source/WebCore/css/SVGCSSValueKeywords.in

@@ -242 +242 @@
 text-after-edge
 ideographic
-alphabetic
 hanging
 mathematical

trunk/Source/WebCore/css/StyleBuilder.cpp

@@ -1149 +1149 @@
     }
 };
+
+#if ENABLE(CSS3_TEXT)
+class ApplyPropertyTextUnderlinePosition {
+public:
+    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
+    {
+        // This is true if value is 'auto' or 'alphabetic'.
+        if (value->isPrimitiveValue()) {
+            TextUnderlinePosition t = *static_cast<CSSPrimitiveValue*>(value);
+            styleResolver->style()->setTextUnderlinePosition(t);
+            return;
+        }
+
+        unsigned t = 0;
+        for (CSSValueListIterator i(value); i.hasMore(); i.advance()) {
+            CSSValue* item = i.value();
+            ASSERT(item->isPrimitiveValue());
+            TextUnderlinePosition t2 = *static_cast<CSSPrimitiveValue*>(item);
+            t |= t2;
+        }
+        styleResolver->style()->setTextUnderlinePosition(static_cast<TextUnderlinePosition>(t));
+    }
+    static PropertyHandler createHandler()
+    {
+        PropertyHandler handler = ApplyPropertyDefaultBase<TextUnderlinePosition, &RenderStyle::textUnderlinePosition, TextUnderlinePosition, &RenderStyle::setTextUnderlinePosition, TextUnderlinePosition, &RenderStyle::initialTextUnderlinePosition>::createHandler();
+        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
+    }
+};
+#endif // CSS3_TEXT
 
 class ApplyPropertyLineHeight {
@@ -1904 +1933 @@
     setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());
     setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
 #endif // CSS3_TEXT
     setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyLength<&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent>::createHandler());

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -3805 +3805 @@
     case CSSPropertyWebkitTextDecorationStyle:
     case CSSPropertyWebkitTextAlignLast:
+    case CSSPropertyWebkitTextUnderlinePosition:
 #endif // CSS3_TEXT
     case CSSPropertyWebkitTextEmphasisColor:

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -576 +576 @@
     TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); }
     TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
+    TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
 #else
     TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; }
@@ -1138 +1139 @@
     void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); }
     void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
+    void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, m_textUnderlinePosition, v); }
 #endif // CSS3_TEXT
     void setDirection(TextDirection v) { inherited_flags._direction = v; }
@@ -1612 +1614 @@
     static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyleSolid; }
     static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
+    static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnderlinePositionAuto; }
 #endif // CSS3_TEXT
     static float initialZoom() { return 1.0f; }

trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

@@ -359 +359 @@
     TextAlignLastAuto, TextAlignLastStart, TextAlignLastEnd, TextAlignLastLeft, TextAlignLastRight, TextAlignLastCenter, TextAlignLastJustify
 };
+
+enum TextUnderlinePosition {
+    // FIXME: Implement support for 'under left' and 'under right' values.
+    TextUnderlinePositionAuto = 0x1, TextUnderlinePositionAlphabetic = 0x2, TextUnderlinePositionUnder = 0x4
+};
 #endif // CSS3_TEXT
 

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

@@ -104 +104 @@
 #if ENABLE(CSS3_TEXT)
     , m_textAlignLast(RenderStyle::initialTextAlignLast())
+    , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
 #endif // CSS3_TEXT
     , m_rubyPosition(RenderStyle::initialRubyPosition())
@@ -173 +174 @@
 #if ENABLE(CSS3_TEXT)
     , m_textAlignLast(o.m_textAlignLast)
+    , m_textUnderlinePosition(o.m_textUnderlinePosition)
 #endif // CSS3_TEXT
     , m_rubyPosition(o.m_rubyPosition)
@@ -268 +270 @@
 #if ENABLE(CSS3_TEXT)
         && m_textAlignLast == o.m_textAlignLast
+        && m_textUnderlinePosition == o.m_textUnderlinePosition
 #endif // CSS3_TEXT
         && m_rubyPosition == o.m_rubyPosition

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

@@ -118 +118 @@
 #if ENABLE(CSS3_TEXT)
     unsigned m_textAlignLast : 3; // TextAlignLast
+    unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition
 #endif // CSS3_TEXT
     unsigned m_rubyPosition : 1; // RubyPosition