Changeset 102557 in webkit

Timestamp:

Dec 11, 2011 8:06:57 PM (12 years ago)

Author:

macpherson@chromium.org

Message:

Implement webkit-line-grid and webkit-line-grid-snap CSS properties in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=74262

Reviewed by Andreas Kling.

No new tests / refactoring only.

• css/CSSStyleApplyProperty.cpp:

(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-11  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement webkit-line-grid and webkit-line-grid-snap CSS properties in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=74262
+
+        Reviewed by Andreas Kling.
+
+        No new tests / refactoring only.
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2011-12-11  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -1640 +1640 @@
     setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitLines, &RenderStyle::setHyphenationLimitLines, &RenderStyle::initialHyphenationLimitLines, CSSValueNoLimit>::createHandler());
 
+    setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitLineGridSnap, ApplyPropertyDefault<LineGridSnap, &RenderStyle::lineGridSnap, LineGridSnap, &RenderStyle::setLineGridSnap, LineGridSnap, &RenderStyle::initialLineGridSnap>::createHandler());
+
     setPropertyHandler(CSSPropertyWebkitTextCombine, ApplyPropertyDefault<TextCombine, &RenderStyle::textCombine, TextCombine, &RenderStyle::setTextCombine, TextCombine, &RenderStyle::initialTextCombine>::createHandler());
     setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyDefault<TextEmphasisPosition, &RenderStyle::textEmphasisPosition, TextEmphasisPosition, &RenderStyle::setTextEmphasisPosition, TextEmphasisPosition, &RenderStyle::initialTextEmphasisPosition>::createHandler());

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3284 +3284 @@
         else if (isInitial)
             m_style->resetColumnRule();
-        return;
-    case CSSPropertyWebkitLineGrid:
-        HANDLE_INHERIT_AND_INITIAL(lineGrid, LineGrid);
-        if (primitiveValue->getIdent() == CSSValueNone)
-            m_style->setLineGrid(nullAtom);
-        else
-            m_style->setLineGrid(primitiveValue->getStringValue());
-        return;
-    case CSSPropertyWebkitLineGridSnap:
-        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(lineGridSnap, LineGridSnap)
         return;
     case CSSPropertyWebkitRegionBreakBefore:
@@ -3899 +3889 @@
     case CSSPropertyWebkitHyphenateLimitBefore:
     case CSSPropertyWebkitHyphenateLimitLines:
+    case CSSPropertyWebkitLineGrid:
+    case CSSPropertyWebkitLineGridSnap:
     case CSSPropertyWebkitTextCombine:
     case CSSPropertyWebkitTextEmphasisPosition: