Modified: trunk/Source/WebCore/ChangeLog (109471 => 109472)
--- trunk/Source/WebCore/ChangeLog 2012-03-02 01:26:49 UTC (rev 109471)
+++ trunk/Source/WebCore/ChangeLog 2012-03-02 01:44:51 UTC (rev 109472)
@@ -1,3 +1,17 @@
+2012-03-01 Luke Macpherson <macpher...@chromium.org>
+
+ Handle CSSPropertyBoxSizing in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=80001
+
+ Reviewed by Andreas Kling.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-03-01 James Robinson <jam...@chromium.org>
[chromium] LayerChromium::contentChanged is redundant with setNeedsDisplay
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (109471 => 109472)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-02 01:26:49 UTC (rev 109471)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-02 01:44:51 UTC (rev 109472)
@@ -1731,6 +1731,7 @@
setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<unsigned, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
setPropertyHandler(CSSPropertyBorderWidth, ApplyPropertyExpanding<SuppressValue, CSSPropertyBorderTopWidth, CSSPropertyBorderRightWidth, CSSPropertyBorderBottomWidth, CSSPropertyBorderLeftWidth>::createHandler());
setPropertyHandler(CSSPropertyBottom, ApplyPropertyLength<&RenderStyle::bottom, &RenderStyle::setBottom, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
+ setPropertyHandler(CSSPropertyBoxSizing, ApplyPropertyDefault<EBoxSizing, &RenderStyle::boxSizing, EBoxSizing, &RenderStyle::setBoxSizing, EBoxSizing, &RenderStyle::initialBoxSizing>::createHandler());
setPropertyHandler(CSSPropertyCaptionSide, ApplyPropertyDefault<ECaptionSide, &RenderStyle::captionSide, ECaptionSide, &RenderStyle::setCaptionSide, ECaptionSide, &RenderStyle::initialCaptionSide>::createHandler());
setPropertyHandler(CSSPropertyClear, ApplyPropertyDefault<EClear, &RenderStyle::clear, EClear, &RenderStyle::setClear, EClear, &RenderStyle::initialClear>::createHandler());
setPropertyHandler(CSSPropertyClip, ApplyPropertyClip::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109471 => 109472)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-02 01:26:49 UTC (rev 109471)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-02 01:44:51 UTC (rev 109472)
@@ -3389,9 +3389,6 @@
return;
case CSSPropertyUnicodeRange: // Only used in @font-face rules.
return;
- case CSSPropertyBoxSizing:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(boxSizing, BoxSizing);
- return;
case CSSPropertyWebkitColumnRuleStyle:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(columnRuleStyle, ColumnRuleStyle, BorderStyle)
return;
@@ -3879,6 +3876,7 @@
case CSSPropertyBorderTopWidth:
case CSSPropertyBorderWidth:
case CSSPropertyBottom:
+ case CSSPropertyBoxSizing:
case CSSPropertyCaptionSide:
case CSSPropertyClear:
case CSSPropertyClip:
