Modified: trunk/Source/WebCore/ChangeLog (109330 => 109331)
--- trunk/Source/WebCore/ChangeLog 2012-03-01 11:36:34 UTC (rev 109330)
+++ trunk/Source/WebCore/ChangeLog 2012-03-01 11:43:31 UTC (rev 109331)
@@ -1,3 +1,17 @@
+2012-03-01 Luke Macpherson <[email protected]>
+
+ Handle CSSPropertyWebkitHyphens in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=80004
+
+ Reviewed by Eric Seidel.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-02-29 Pavel Podivilov <[email protected]>
Web Inspector: abstract out the common pattern of creating auto-updated locations.
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (109330 => 109331)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 11:36:34 UTC (rev 109330)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 11:43:31 UTC (rev 109331)
@@ -1847,6 +1847,7 @@
setPropertyHandler(CSSPropertyWebkitHyphenateLimitAfter, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitAfter, &RenderStyle::setHyphenationLimitAfter, &RenderStyle::initialHyphenationLimitAfter>::createHandler());
setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler());
setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitLines, &RenderStyle::setHyphenationLimitLines, &RenderStyle::initialHyphenationLimitLines, CSSValueNoLimit>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitHyphens, ApplyPropertyDefault<Hyphens, &RenderStyle::hyphens, Hyphens, &RenderStyle::setHyphens, Hyphens, &RenderStyle::initialHyphens>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineAlign, ApplyPropertyDefault<LineAlign, &RenderStyle::lineAlign, LineAlign, &RenderStyle::setLineAlign, LineAlign, &RenderStyle::initialLineAlign>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineBreak, ApplyPropertyDefault<EKHTMLLineBreak, &RenderStyle::khtmlLineBreak, EKHTMLLineBreak, &RenderStyle::setKHTMLLineBreak, EKHTMLLineBreak, &RenderStyle::initialKHTMLLineBreak>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109330 => 109331)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 11:36:34 UTC (rev 109330)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 11:43:31 UTC (rev 109331)
@@ -3493,9 +3493,6 @@
m_style->setLineClamp(LineClampValue(primitiveValue->getIntValue(CSSPrimitiveValue::CSS_PERCENTAGE), LineClampPercentage));
return;
}
- case CSSPropertyWebkitHyphens:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(hyphens, Hyphens);
- return;
case CSSPropertyWebkitLocale: {
HANDLE_INHERIT_AND_INITIAL(locale, Locale);
if (primitiveValue->getIdent() == CSSValueAuto)
@@ -3988,6 +3985,7 @@
case CSSPropertyWebkitHyphenateLimitAfter:
case CSSPropertyWebkitHyphenateLimitBefore:
case CSSPropertyWebkitHyphenateLimitLines:
+ case CSSPropertyWebkitHyphens:
case CSSPropertyWebkitLineAlign:
case CSSPropertyWebkitLineBreak:
case CSSPropertyWebkitLineGrid:
