Modified: trunk/Source/WebCore/ChangeLog (110543 => 110544)
--- trunk/Source/WebCore/ChangeLog 2012-03-13 07:28:46 UTC (rev 110543)
+++ trunk/Source/WebCore/ChangeLog 2012-03-13 08:12:12 UTC (rev 110544)
@@ -1,3 +1,17 @@
+2012-03-13 Luke Macpherson <macpher...@chromium.org>
+
+ Implement CSSPropertyTextOverflow in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=80934
+
+ Reviewed by Andreas Kling.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-03-12 Matt Falkenhagen <fal...@chromium.org>
Switch Chromium from LocaleToScriptMappingICU.cpp to LocaleToScriptMappingDefault.cpp
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (110543 => 110544)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-13 07:28:46 UTC (rev 110543)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-13 08:12:12 UTC (rev 110544)
@@ -1834,6 +1834,7 @@
setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler());
setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyLength<&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent>::createHandler());
+ setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
setPropertyHandler(CSSPropertyTextTransform, ApplyPropertyDefault<ETextTransform, &RenderStyle::textTransform, ETextTransform, &RenderStyle::setTextTransform, ETextTransform, &RenderStyle::initialTextTransform>::createHandler());
setPropertyHandler(CSSPropertyTop, ApplyPropertyLength<&RenderStyle::top, &RenderStyle::setTop, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (110543 => 110544)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-13 07:28:46 UTC (rev 110543)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-13 08:12:12 UTC (rev 110544)
@@ -3470,12 +3470,6 @@
}
return;
}
- case CSSPropertyTextOverflow: {
- // This property is supported by WinIE, and so we leave off the "-webkit-" in order to
- // work with WinIE-specific pages that use the property.
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textOverflow, TextOverflow)
- return;
- }
case CSSPropertyWebkitLineClamp: {
HANDLE_INHERIT_AND_INITIAL(lineClamp, LineClamp)
if (!primitiveValue)
@@ -3927,6 +3921,7 @@
case CSSPropertyTextAlign:
case CSSPropertyTextDecoration:
case CSSPropertyTextIndent:
+ case CSSPropertyTextOverflow:
case CSSPropertyTextRendering:
case CSSPropertyTextTransform:
case CSSPropertyTop:
