Changeset 176571 in webkit

Timestamp:

Nov 28, 2014, 10:20:25 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Move the '-webkit-initial-letter', '-webkit-line-box-contain' and '-webkit-text-stroke-width' CSS properties to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=139053

Patch by Sam Weinig <​sam@webkit.org> on 2014-11-28
Reviewed by Andreas Kling.

• css/CSSPropertyNames.in:
• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertInitialLetter):
(WebCore::StyleBuilderConverter::convertTextStrokeWidth):
(WebCore::StyleBuilderConverter::convertLineBoxContain):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPropertyNames.in (modified) (2 diffs)
• css/StyleBuilderConverter.h (modified) (2 diffs)
• css/StyleResolver.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-28  Sam Weinig  <sam@webkit.org>
+
+        Move the '-webkit-initial-letter', '-webkit-line-box-contain' and '-webkit-text-stroke-width' CSS properties to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=139053
+
+        Reviewed by Andreas Kling.
+
+        * css/CSSPropertyNames.in:
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertInitialLetter):
+        (WebCore::StyleBuilderConverter::convertTextStrokeWidth):
+        (WebCore::StyleBuilderConverter::convertLineBoxContain):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
 2014-11-26  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -413 +413 @@
 -webkit-hyphens [Inherited, TypeName=Hyphens]
 -epub-hyphens = -webkit-hyphens
--webkit-initial-letter [LegacyStyleBuilder]
--webkit-line-box-contain [Inherited, LegacyStyleBuilder]
+-webkit-initial-letter [Converter=InitialLetter]
+-webkit-line-box-contain [Inherited, Converter=LineBoxContain]
 -webkit-line-align [Inherited, TypeName=LineAlign]
 -webkit-line-break [Inherited, TypeName=LineBreak]
@@ -508 +508 @@
 -webkit-text-stroke [Inherited, LegacyStyleBuilder]
 -webkit-text-stroke-color [Inherited, LegacyStyleBuilder]
--webkit-text-stroke-width [Inherited, LegacyStyleBuilder]
+-webkit-text-stroke-width [Inherited, Converter=TextStrokeWidth]
 -webkit-transform [Converter=Transform]
 -webkit-transform-origin [LegacyStyleBuilder]

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -71 +71 @@
     static TextUnderlinePosition convertTextUnderlinePosition(StyleResolver&, CSSValue&);
     static PassRefPtr<StyleReflection> convertReflection(StyleResolver&, CSSValue&);
+    static IntSize convertInitialLetter(StyleResolver&, CSSValue&);
+    static float convertTextStrokeWidth(StyleResolver&, CSSValue&);
+    static LineBoxContain convertLineBoxContain(StyleResolver&, CSSValue&);
 
 private:
@@ -495 +498 @@
 }
 
+inline IntSize StyleBuilderConverter::convertInitialLetter(StyleResolver&, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    if (primitiveValue.getValueID() == CSSValueNormal)
+        return IntSize();
+
+    Pair* pair = primitiveValue.getPairValue();
+    ASSERT(pair);
+    ASSERT(pair->first());
+    ASSERT(pair->second());
+
+    return IntSize(pair->first()->getIntValue(), pair->second()->getIntValue());
+}
+
+inline float StyleBuilderConverter::convertTextStrokeWidth(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    float width = 0;
+    switch (primitiveValue.getValueID()) {
+    case CSSValueThin:
+    case CSSValueMedium:
+    case CSSValueThick: {
+        double result = 1.0 / 48;
+        if (primitiveValue.getValueID() == CSSValueMedium)
+            result *= 3;
+        else if (primitiveValue.getValueID() == CSSValueThick)
+            result *= 5;
+        Ref<CSSPrimitiveValue> emsValue(CSSPrimitiveValue::create(result, CSSPrimitiveValue::CSS_EMS));
+        width = convertComputedLength<float>(styleResolver, emsValue);
+        break;
+    }
+    case CSSValueInvalid: {
+        width = convertComputedLength<float>(styleResolver, primitiveValue);
+        break;
+    }
+    default:
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+
+    return width;
+}
+
+inline LineBoxContain StyleBuilderConverter::convertLineBoxContain(StyleResolver&, CSSValue& value)
+{
+    if (is<CSSPrimitiveValue>(value)) {
+        ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone);
+        return LineBoxContainNone;
+    }
+
+    return downcast<CSSLineBoxContainValue>(value).value();
+}
+
+
 } // namespace WebCore
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2490 +2490 @@
     }
 #endif
-    case CSSPropertyWebkitTextStrokeWidth: {
-        HANDLE_INHERIT_AND_INITIAL(textStrokeWidth, TextStrokeWidth)
-        float width = 0;
-        switch (primitiveValue->getValueID()) {
-        case CSSValueThin:
-        case CSSValueMedium:
-        case CSSValueThick: {
-            double result = 1.0 / 48;
-            if (primitiveValue->getValueID() == CSSValueMedium)
-                result *= 3;
-            else if (primitiveValue->getValueID() == CSSValueThick)
-                result *= 5;
-            Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(result, CSSPrimitiveValue::CSS_EMS));
-            width = value.get().computeLength<float>(state.cssToLengthConversionData());
-            break;
-        }
-        default:
-            width = primitiveValue->computeLength<float>(state.cssToLengthConversionData());
-            break;
-        }
-        state.style()->setTextStrokeWidth(width);
-        return;
-    }
     case CSSPropertyWebkitPerspective: {
         HANDLE_INHERIT_AND_INITIAL(perspective, Perspective)
@@ -2613 +2590 @@
     }
 
-    case CSSPropertyWebkitLineBoxContain: {
-        HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain)
-        if (primitiveValue && primitiveValue->getValueID() == CSSValueNone) {
-            state.style()->setLineBoxContain(LineBoxContainNone);
-            return;
-        }
-
-        if (!is<CSSLineBoxContainValue>(*value))
-            return;
-
-        state.style()->setLineBoxContain(downcast<CSSLineBoxContainValue>(*value).value());
-        return;
-    }
-
     // CSS Fonts Module Level 3
     case CSSPropertyWebkitFontFeatureSettings: {
@@ -2888 +2851 @@
     }
 #endif
-
-    case CSSPropertyWebkitInitialLetter: {
-        HANDLE_INHERIT_AND_INITIAL(initialLetter, InitialLetter)
-        if (!value->isPrimitiveValue())
-            return;
-        
-        if (primitiveValue->getValueID() == CSSValueNormal) {
-            state.style()->setInitialLetter(IntSize());
-            return;
-        }
-            
-        Pair* pair = primitiveValue->getPairValue();
-        if (!pair || !pair->first() || !pair->second())
-            return;
-
-        state.style()->setInitialLetter(IntSize(pair->first()->getIntValue(), pair->second()->getIntValue()));
-        return;
-    }
     
     // These properties are aliased and DeprecatedStyleBuilder already applied the property on the prefixed version.
@@ -3098 +3043 @@
     case CSSPropertyWebkitHyphenateLimitLines:
     case CSSPropertyWebkitHyphens:
+    case CSSPropertyWebkitInitialLetter:
     case CSSPropertyWebkitLineAlign:
+    case CSSPropertyWebkitLineBoxContain:
     case CSSPropertyWebkitLineBreak:
     case CSSPropertyWebkitLineClamp:
@@ -3153 +3100 @@
     case CSSPropertyWebkitTextSecurity:
     case CSSPropertyWebkitTextStrokeColor:
+    case CSSPropertyWebkitTextStrokeWidth:
     case CSSPropertyWebkitTransformOriginX:
     case CSSPropertyWebkitTransformOriginY: