Changeset 176584 in webkit

Timestamp:

Nov 29, 2014, 4:39:14 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Move the '-webkit-locale', '-webkit-text-orientation', '-webkit-writing-mode', '-webkit-justify-self' and '-webkit-perspective' CSS properties to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=139104

Patch by Sam Weinig <​sam@webkit.org> on 2014-11-29
Reviewed by Anders Carlsson.

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

(WebCore::StyleBuilderFunctions::applyValueWebkitLocale):
(WebCore::StyleBuilderFunctions::applyValueWebkitWritingMode):
(WebCore::StyleBuilderFunctions::applyValueWebkitTextOrientation):
(WebCore::StyleBuilderFunctions::applyValueWebkitJustifySelf):
(WebCore::StyleBuilderFunctions::applyValueWebkitPerspective):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-29  Sam Weinig  <sam@webkit.org>
+
+        Move the '-webkit-locale', '-webkit-text-orientation', '-webkit-writing-mode', '-webkit-justify-self' and '-webkit-perspective' CSS properties to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=139104
+
+        Reviewed by Anders Carlsson.
+
+        * css/CSSPropertyNames.in:
+        * css/StyleBuilderCustom.h:
+        (WebCore::StyleBuilderFunctions::applyValueWebkitLocale):
+        (WebCore::StyleBuilderFunctions::applyValueWebkitWritingMode):
+        (WebCore::StyleBuilderFunctions::applyValueWebkitTextOrientation):
+        (WebCore::StyleBuilderFunctions::applyValueWebkitJustifySelf):
+        (WebCore::StyleBuilderFunctions::applyValueWebkitPerspective):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
 2014-11-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -70 +70 @@
 -webkit-font-smoothing [Inherited, LegacyStyleBuilder]
 -webkit-font-variant-ligatures [Inherited, LegacyStyleBuilder]
--webkit-locale [Inherited, LegacyStyleBuilder]
--webkit-text-orientation [Inherited, LegacyStyleBuilder]
+-webkit-locale [Inherited, Custom=Value]
+-webkit-text-orientation [Inherited, Custom=Value]
 -epub-text-orientation = -webkit-text-orientation
 #if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
 -webkit-text-size-adjust [Inherited, LegacyStyleBuilder]
 #endif
--webkit-writing-mode [Inherited, LegacyStyleBuilder]
+-webkit-writing-mode [Inherited, Custom=Value]
 -epub-writing-mode = -webkit-writing-mode
 zoom [Custom=All]
@@ -388 +388 @@
 -webkit-backdrop-filter [LegacyStyleBuilder]
 #endif
--webkit-justify-self [LegacyStyleBuilder]
+-webkit-justify-self [Custom=Value]
 -webkit-font-size-delta [LegacyStyleBuilder]
 #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
@@ -467 +467 @@
 -webkit-padding-end [LegacyStyleBuilder]
 -webkit-padding-start [LegacyStyleBuilder]
--webkit-perspective [LegacyStyleBuilder]
+-webkit-perspective [Custom=Value]
 -webkit-perspective-origin [LegacyStyleBuilder]
 -webkit-perspective-origin-x [Converter=Length]

trunk/Source/WebCore/css/StyleBuilderCustom.h

@@ -33 +33 @@
 #include "CSSImageValue.h"
 #include "Frame.h"
+#include "LocaleToScriptMapping.h"
 #include "Rect.h"
 #include "StyleResolver.h"
@@ -648 +649 @@
 }
 
+inline void applyValueWebkitLocale(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    if (primitiveValue.getValueID() == CSSValueAuto)
+        styleResolver.style()->setLocale(nullAtom);
+    else
+        styleResolver.style()->setLocale(primitiveValue.getStringValue());
+    
+    FontDescription fontDescription = styleResolver.style()->fontDescription();
+    fontDescription.setScript(localeToScriptCodeForFontSelection(styleResolver.style()->locale()));
+    styleResolver.setFontDescription(fontDescription);
+}
+
+inline void applyValueWebkitWritingMode(StyleResolver& styleResolver, CSSValue& value)
+{
+    styleResolver.setWritingMode(downcast<CSSPrimitiveValue>(value));
+
+    // FIXME: It is not ok to modify document state while applying style.
+    auto& state = styleResolver.state();
+    if (state.element() && state.element() == state.document().documentElement())
+        state.document().setWritingModeSetOnDocumentElement(true);
+}
+
+inline void applyValueWebkitTextOrientation(StyleResolver& styleResolver, CSSValue& value)
+{
+    styleResolver.setTextOrientation(downcast<CSSPrimitiveValue>(value));
+}
+
+inline void applyValueWebkitJustifySelf(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    if (Pair* pairValue = primitiveValue.getPairValue()) {
+        styleResolver.style()->setJustifySelf(*pairValue->first());
+        styleResolver.style()->setJustifySelfOverflowAlignment(*pairValue->second());
+    } else
+        styleResolver.style()->setJustifySelf(primitiveValue);
+}
+
+inline void applyValueWebkitPerspective(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    if (primitiveValue.getValueID() == CSSValueNone) {
+        styleResolver.style()->setPerspective(0);
+        return;
+    }
+
+    float perspectiveValue;
+    if (primitiveValue.isLength())
+        perspectiveValue = primitiveValue.computeLength<float>(styleResolver.state().cssToLengthConversionData());
+    else if (primitiveValue.isNumber()) {
+        // For backward compatibility, treat valueless numbers as px.
+        Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(primitiveValue.getDoubleValue(), CSSPrimitiveValue::CSS_PX));
+        perspectiveValue = value.get().computeLength<float>(styleResolver.state().cssToLengthConversionData());
+    } else {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+
+    if (perspectiveValue >= 0.0f)
+        styleResolver.style()->setPerspective(perspectiveValue);
+}
+
 } // namespace StyleBuilderFunctions
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2416 +2416 @@
     case CSSPropertyUnicodeRange: // Only used in @font-face rules.
         return;
-    case CSSPropertyWebkitLocale: {
-        HANDLE_INHERIT_AND_INITIAL(locale, Locale);
-        if (!primitiveValue)
-            return;
-        if (primitiveValue->getValueID() == CSSValueAuto)
-            state.style()->setLocale(nullAtom);
-        else
-            state.style()->setLocale(primitiveValue->getStringValue());
-        FontDescription fontDescription = state.style()->fontDescription();
-        fontDescription.setScript(localeToScriptCodeForFontSelection(state.style()->locale()));
-        setFontDescription(fontDescription);
-        return;
-    }
 #if ENABLE(IOS_TEXT_AUTOSIZING)
     case CSSPropertyWebkitTextSizeAdjust: {
@@ -2490 +2477 @@
     }
 #endif
-    case CSSPropertyWebkitPerspective: {
-        HANDLE_INHERIT_AND_INITIAL(perspective, Perspective)
-
-        if (!primitiveValue)
-            return;
-
-        if (primitiveValue->getValueID() == CSSValueNone) {
-            state.style()->setPerspective(0);
-            return;
-        }
-
-        float perspectiveValue;
-        if (primitiveValue->isLength())
-            perspectiveValue = primitiveValue->computeLength<float>(state.cssToLengthConversionData());
-        else if (primitiveValue->isNumber()) {
-            // For backward compatibility, treat valueless numbers as px.
-            Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(primitiveValue->getDoubleValue(), CSSPrimitiveValue::CSS_PX));
-            perspectiveValue = value.get().computeLength<float>(state.cssToLengthConversionData());
-        } else
-            return;
-
-        if (perspectiveValue >= 0.0f)
-            state.style()->setPerspective(perspectiveValue);
-        return;
-    }
 #if PLATFORM(IOS)
     case CSSPropertyWebkitTouchCallout: {
@@ -2568 +2530 @@
         return;
 
-    // CSS Text Layout Module Level 3: Vertical writing support
-    case CSSPropertyWebkitWritingMode: {
-        HANDLE_INHERIT_AND_INITIAL(writingMode, WritingMode);
-        
-        if (primitiveValue)
-            setWritingMode(*primitiveValue);
-
-        // FIXME: It is not ok to modify document state while applying style.
-        if (state.element() && state.element() == state.document().documentElement())
-            state.document().setWritingModeSetOnDocumentElement(true);
-        return;
-    }
-
-    case CSSPropertyWebkitTextOrientation: {
-        HANDLE_INHERIT_AND_INITIAL(textOrientation, TextOrientation);
-
-        if (primitiveValue)
-            setTextOrientation(*primitiveValue);
-
-        return;
-    }
-
     // CSS Fonts Module Level 3
     case CSSPropertyWebkitFontFeatureSettings: {
@@ -2810 +2750 @@
     }
 #endif /* ENABLE(CSS_GRID_LAYOUT) */
-
-    case CSSPropertyWebkitJustifySelf:
-        HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
-        if (Pair* pairValue = primitiveValue->getPairValue()) {
-            state.style()->setJustifySelf(*pairValue->first());
-            state.style()->setJustifySelfOverflowAlignment(*pairValue->second());
-        } else
-            state.style()->setJustifySelf(*primitiveValue);
-        return;
-
 #if ENABLE(CSS_SCROLL_SNAP)
     case CSSPropertyWebkitScrollSnapType:
@@ -3010 +2940 @@
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
+    case CSSPropertyWebkitJustifySelf:
+    case CSSPropertyWebkitLocale:
+    case CSSPropertyWebkitTextOrientation:
+    case CSSPropertyWebkitWritingMode:
     case CSSPropertyColumnCount:
     case CSSPropertyColumnGap:
@@ -3072 +3006 @@
     case CSSPropertyWebkitMaskSourceType:
     case CSSPropertyWebkitNbspMode:
+    case CSSPropertyWebkitPerspective:
     case CSSPropertyWebkitPerspectiveOrigin:
     case CSSPropertyWebkitPerspectiveOriginX: