Changeset 176524 in webkit

Timestamp:

Nov 24, 2014, 2:12:53 PM (12 years ago)

Author:

weinig@apple.com

Message:

Move the '-webkit-box-reflext' CSS property to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=139008

Reviewed by Anders Carlsson.

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

(WebCore::StyleBuilderConverter::convertReflection):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-22  Sam Weinig  <sam@webkit.org>
+
+        Move the '-webkit-box-reflext' CSS property to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=139008
+
+        Reviewed by Anders Carlsson.
+
+        * css/CSSPropertyNames.in:
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertReflection):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
 2014-11-24  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -323 +323 @@
 -webkit-box-orient
 -webkit-box-pack
--webkit-box-reflect [LegacyStyleBuilder]
+-webkit-box-reflect [Converter=Reflection]
 // -webkit-box-shadow differs from box-shadow in its treatement of blur radii > 8px.
 // Let -webkit-box-shadow blur radius be w_r and box-shadow blur radius be b_r. For

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -31 +31 @@
 #include "CSSCalculationValue.h"
 #include "CSSPrimitiveValue.h"
+#include "CSSReflectValue.h"
 #include "Length.h"
 #include "Pair.h"
@@ -69 +70 @@
     static PassRefPtr<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
     static TextUnderlinePosition convertTextUnderlinePosition(StyleResolver&, CSSValue&);
+    static PassRefPtr<StyleReflection> convertReflection(StyleResolver&, CSSValue&);
 
 private:
@@ -470 +472 @@
 }
 
+inline PassRefPtr<StyleReflection> StyleBuilderConverter::convertReflection(StyleResolver& styleResolver, CSSValue& value)
+{
+    if (is<CSSPrimitiveValue>(value)) {
+        ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone);
+        return nullptr;
+    }
+
+    CSSReflectValue& reflectValue = downcast<CSSReflectValue>(value);
+
+    RefPtr<StyleReflection> reflection = StyleReflection::create();
+    reflection->setDirection(*reflectValue.direction());
+
+    if (reflectValue.offset())
+        reflection->setOffset(reflectValue.offset()->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver.state().cssToLengthConversionData()));
+
+    NinePieceImage mask;
+    mask.setMaskDefaults();
+    styleResolver.styleMap()->mapNinePieceImage(CSSPropertyWebkitBoxReflect, reflectValue.mask(), mask);
+    reflection->setMask(mask);
+
+    return reflection.release();
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2412 +2412 @@
         return;
     }
-    case CSSPropertyWebkitBoxReflect: {
-        HANDLE_INHERIT_AND_INITIAL(boxReflect, BoxReflect)
-        if (primitiveValue) {
-            state.style()->setBoxReflect(RenderStyle::initialBoxReflect());
-            return;
-        }
-
-        if (!is<CSSReflectValue>(*value))
-            return;
-
-        CSSReflectValue& reflectValue = downcast<CSSReflectValue>(*value);
-        RefPtr<StyleReflection> reflection = StyleReflection::create();
-        reflection->setDirection(*reflectValue.direction());
-        if (reflectValue.offset())
-            reflection->setOffset(reflectValue.offset()->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(state.cssToLengthConversionData()));
-        NinePieceImage mask;
-        mask.setMaskDefaults();
-        m_styleMap.mapNinePieceImage(id, reflectValue.mask(), mask);
-        reflection->setMask(mask);
-
-        state.style()->setBoxReflect(reflection.release());
-        return;
-    }
     case CSSPropertySrc: // Only used in @font-face rules.
         return;
@@ -3082 +3059 @@
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
+    case CSSPropertyWebkitBoxReflect:
     case CSSPropertyWebkitColorCorrection:
     case CSSPropertyWebkitColumnAxis: