Modified: trunk/Source/WebCore/ChangeLog (101233 => 101234)
--- trunk/Source/WebCore/ChangeLog 2011-11-28 09:37:08 UTC (rev 101233)
+++ trunk/Source/WebCore/ChangeLog 2011-11-28 09:46:07 UTC (rev 101234)
@@ -1,3 +1,17 @@
+2011-11-28 Luke Macpherson <macpher...@chromium.org>
+
+ Implement CSSPropertyWebkitFlowInto and CSSPropertyWebkitFlowFrom in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=73110
+
+ Reviewed by Andreas Kling.
+
+ Covered by existing tests under fast/regions.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+
2011-11-27 Luke Macpherson <macpher...@chromium.org>
Implement vertical-align property in CSSStyleApplyProperty.
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (101233 => 101234)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-11-28 09:37:08 UTC (rev 101233)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2011-11-28 09:46:07 UTC (rev 101234)
@@ -1147,6 +1147,9 @@
setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
setPropertyHandler(CSSPropertyWebkitColumns, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitColumnWidth, CSSPropertyWebkitColumnCount>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapAutoToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
+
setPropertyHandler(CSSPropertyWebkitHighlight, ApplyPropertyString<MapNoneToNull, &RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight>::createHandler());
setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (101233 => 101234)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-11-28 09:37:08 UTC (rev 101233)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-11-28 09:46:07 UTC (rev 101234)
@@ -3488,20 +3488,6 @@
case CSSPropertyWebkitMarqueeStyle:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marqueeBehavior, MarqueeBehavior)
return;
- case CSSPropertyWebkitFlowInto:
- HANDLE_INHERIT_AND_INITIAL(flowThread, FlowThread);
- if (primitiveValue->getIdent() == CSSValueAuto)
- m_style->setFlowThread(nullAtom);
- else
- m_style->setFlowThread(primitiveValue->getStringValue());
- return;
- case CSSPropertyWebkitFlowFrom:
- HANDLE_INHERIT_AND_INITIAL(regionThread, RegionThread);
- if (primitiveValue->getIdent() == CSSValueNone)
- m_style->setRegionThread(nullAtom);
- else
- m_style->setRegionThread(primitiveValue->getStringValue());
- return;
case CSSPropertyWebkitRegionOverflow:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(regionOverflow, RegionOverflow);
return;
@@ -4013,6 +3999,8 @@
case CSSPropertyWebkitColumnCount:
case CSSPropertyWebkitColumnGap:
case CSSPropertyWebkitColumnWidth:
+ case CSSPropertyWebkitFlowInto:
+ case CSSPropertyWebkitFlowFrom:
case CSSPropertyWebkitHighlight:
case CSSPropertyWebkitHyphenateCharacter:
case CSSPropertyWebkitTextCombine:
