Changeset 92742 in webkit

Timestamp:

Aug 9, 2011 6:44:07 PM (13 years ago)

Author:

macpherson@chromium.org

Message:

Implement string based properties in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=65662

Reviewed by Darin Adler.

No new tests / refactoring only.

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyString::ApplyPropertyString):
Added class to handle string based properties.
(WebCore::ApplyPropertyString::applyValue):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
Add initializers for CSSPropertyWebkitHighlight and CSSPropertyWebkitHyphenateCharacter.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
Remove existing implementations for CSSPropertyWebkitHighlight and CSSPropertyWebkitHyphenateCharacter.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleApplyProperty.cpp (modified) (3 diffs)
• css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-09  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement string based properties in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=65662
+
+        Reviewed by Darin Adler.
+
+        No new tests / refactoring only.
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyString::ApplyPropertyString):
+        Added class to handle string based properties.
+        (WebCore::ApplyPropertyString::applyValue):
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        Add initializers for CSSPropertyWebkitHighlight and CSSPropertyWebkitHyphenateCharacter.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove existing implementations for CSSPropertyWebkitHighlight and CSSPropertyWebkitHyphenateCharacter.
+
 2011-08-09  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -266 +266 @@
 };
 
-enum LengthAuto {AutoDisabled = 0, AutoEnabled = 1};
-enum LengthIntrinsic {IntrinsicDisabled = 0, IntrinsicEnabled = 1};
-enum LengthMinIntrinsic {MinIntrinsicDisabled = 0, MinIntrinsicEnabled = 1};
-enum LengthNone {NoneDisabled = 0, NoneEnabled = 1};
-enum LengthUndefined {UndefinedDisabled = 0, UndefinedEnabled = 1};
-enum LengthFlexDirection {FlexDirectionDisabled = 0, FlexWidth = 1, FlexHeight};
+enum LengthAuto { AutoDisabled = 0, AutoEnabled };
+enum LengthIntrinsic { IntrinsicDisabled = 0, IntrinsicEnabled };
+enum LengthMinIntrinsic { MinIntrinsicDisabled = 0, MinIntrinsicEnabled };
+enum LengthNone { NoneDisabled = 0, NoneEnabled };
+enum LengthUndefined { UndefinedDisabled = 0, UndefinedEnabled };
+enum LengthFlexDirection { FlexDirectionDisabled = 0, FlexWidth, FlexHeight };
 template <LengthAuto autoEnabled = AutoDisabled,
           LengthIntrinsic intrinsicEnabled = IntrinsicDisabled,
@@ -330 +330 @@
                 setValue(selector->style(), Length(primitiveValue->getDoubleValue(), Percent));
         }
+    }
+};
+
+enum StringIdentBehavior { NothingMapsToNull = 0, MapNoneToNull, MapAutoToNull };
+template <StringIdentBehavior identBehavior = NothingMapsToNull>
+class ApplyPropertyString : public ApplyPropertyDefaultBase<const AtomicString&> {
+public:
+    ApplyPropertyString(GetterFunction getter, SetterFunction setter, InitialFunction initial)
+        : ApplyPropertyDefaultBase<const AtomicString&>(getter, setter, initial)
+    {
+    }
+
+private:
+    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
+    {
+        if (!value->isPrimitiveValue())
+            return;
+        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+        if ((identBehavior == MapNoneToNull && primitiveValue->getIdent() == CSSValueNone)
+            || (identBehavior == MapAutoToNull && primitiveValue->getIdent() == CSSValueAuto))
+            setValue(selector->style(), nullAtom);
+        else
+            setValue(selector->style(), primitiveValue->getStringValue());
     }
 };
@@ -932 +955 @@
     setPropertyHandler(CSSPropertyWebkitColumnWidth, new ApplyPropertyAuto<float, ComputeLength>(&RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth));
 
+    setPropertyHandler(CSSPropertyWebkitHighlight, new ApplyPropertyString<MapNoneToNull>(&RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight));
+    setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, new ApplyPropertyString<MapAutoToNull>(&RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString));
+
     setPropertyHandler(CSSPropertyWebkitTextCombine, new ApplyPropertyDefault<TextCombine>(&RenderStyle::textCombine, &RenderStyle::setTextCombine, &RenderStyle::initialTextCombine));
     setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, new ApplyPropertyDefault<TextEmphasisPosition>(&RenderStyle::textEmphasisPosition, &RenderStyle::setTextEmphasisPosition, &RenderStyle::initialTextEmphasisPosition));

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4742 +4742 @@
         return;
     }
-    case CSSPropertyWebkitHighlight: {
-        HANDLE_INHERIT_AND_INITIAL(highlight, Highlight);
-        if (primitiveValue->getIdent() == CSSValueNone)
-            m_style->setHighlight(nullAtom);
-        else
-            m_style->setHighlight(primitiveValue->getStringValue());
-        return;
-    }
     case CSSPropertyWebkitHyphens:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(hyphens, Hyphens);
         return;
-    case CSSPropertyWebkitHyphenateCharacter: {
-        HANDLE_INHERIT_AND_INITIAL(hyphenationString, HyphenationString);
-        if (primitiveValue->getIdent() == CSSValueAuto)
-            m_style->setHyphenationString(nullAtom);
-        else
-            m_style->setHyphenationString(primitiveValue->getStringValue());
-        return;
-    }
     case CSSPropertyWebkitHyphenateLimitAfter: {
         HANDLE_INHERIT_AND_INITIAL(hyphenationLimitAfter, HyphenationLimitAfter);
@@ -5223 +5207 @@
     case CSSPropertyWebkitColumnGap:
     case CSSPropertyWebkitColumnWidth:
+    case CSSPropertyWebkitHighlight:
+    case CSSPropertyWebkitHyphenateCharacter:
     case CSSPropertyWebkitTextCombine:
     case CSSPropertyWebkitTextEmphasisPosition: