Modified: trunk/Source/WebCore/ChangeLog (131676 => 131677)
--- trunk/Source/WebCore/ChangeLog 2012-10-18 00:09:04 UTC (rev 131676)
+++ trunk/Source/WebCore/ChangeLog 2012-10-18 00:18:16 UTC (rev 131677)
@@ -1,3 +1,19 @@
+2012-10-17 Luke Macpherson <[email protected]>
+
+ Move handling of CSSPropertyWebkitLineClamp from StyleResolver into StyleBuilder.
+ https://bugs.webkit.org/show_bug.cgi?id=99534
+
+ Reviewed by Alexis Menard.
+
+ One small step towards removing the giant switch statement in StyleResolver, this patch moves line clamp handling into StyleBuilder.
+
+ Covered by fast/overflow/line-clamp.html
+
+ * css/StyleBuilder.cpp:
+ (WebCore::StyleBuilder::StyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
2012-10-17 Andy Estes <[email protected]>
[WebKit2] Add removeChild: to WKDOMNode and make WKDOMText.data read/write
Modified: trunk/Source/WebCore/css/StyleBuilder.cpp (131676 => 131677)
--- trunk/Source/WebCore/css/StyleBuilder.cpp 2012-10-18 00:09:04 UTC (rev 131676)
+++ trunk/Source/WebCore/css/StyleBuilder.cpp 2012-10-18 00:18:16 UTC (rev 131677)
@@ -2003,6 +2003,7 @@
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(CSSPropertyWebkitLineClamp, ApplyPropertyDefault<const LineClampValue&, &RenderStyle::lineClamp, LineClampValue, &RenderStyle::setLineClamp, LineClampValue, &RenderStyle::initialLineClamp>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
setPropertyHandler(CSSPropertyWebkitLineSnap, ApplyPropertyDefault<LineSnap, &RenderStyle::lineSnap, LineSnap, &RenderStyle::setLineSnap, LineSnap, &RenderStyle::initialLineSnap>::createHandler());
setPropertyHandler(CSSPropertyWebkitMarginAfterCollapse, ApplyPropertyDefault<EMarginCollapse, &RenderStyle::marginAfterCollapse, EMarginCollapse, &RenderStyle::setMarginAfterCollapse, EMarginCollapse, &RenderStyle::initialMarginAfterCollapse>::createHandler());
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (131676 => 131677)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-10-18 00:09:04 UTC (rev 131676)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-10-18 00:18:16 UTC (rev 131677)
@@ -3318,9 +3318,6 @@
}
return;
}
- case CSSPropertyWebkitLineClamp:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(lineClamp, LineClamp)
- return;
case CSSPropertyWebkitLocale: {
HANDLE_INHERIT_AND_INITIAL(locale, Locale);
if (!primitiveValue)
@@ -3835,6 +3832,7 @@
case CSSPropertyWebkitHyphens:
case CSSPropertyWebkitLineAlign:
case CSSPropertyWebkitLineBreak:
+ case CSSPropertyWebkitLineClamp:
case CSSPropertyWebkitLineGrid:
case CSSPropertyWebkitLineSnap:
case CSSPropertyWebkitMarqueeDirection:
