Modified: trunk/Source/WebCore/ChangeLog (102556 => 102557)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 03:55:06 UTC (rev 102556)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 04:06:57 UTC (rev 102557)
@@ -1,3 +1,17 @@
+2011-12-11 Luke Macpherson <macpher...@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 <hara...@chromium.org>
Use the [Supplemental] IDL for webaudio attributes in Chromium
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102556 => 102557)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 03:55:06 UTC (rev 102556)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-12-12 04:06:57 UTC (rev 102557)
@@ -1639,6 +1639,9 @@
setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler());
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());
setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102556 => 102557)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 03:55:06 UTC (rev 102556)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-12 04:06:57 UTC (rev 102557)
@@ -3284,16 +3284,6 @@
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:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(regionBreakBefore, RegionBreakBefore, PageBreak)
return;
@@ -3898,6 +3888,8 @@
case CSSPropertyWebkitHyphenateLimitAfter:
case CSSPropertyWebkitHyphenateLimitBefore:
case CSSPropertyWebkitHyphenateLimitLines:
+ case CSSPropertyWebkitLineGrid:
+ case CSSPropertyWebkitLineGridSnap:
case CSSPropertyWebkitTextCombine:
case CSSPropertyWebkitTextEmphasisPosition:
case CSSPropertyWebkitTextEmphasisStyle:
