Title: [110662] trunk/Source/WebCore
- Revision
- 110662
- Author
- macpher...@chromium.org
- Date
- 2012-03-13 20:19:02 -0700 (Tue, 13 Mar 2012)
Log Message
Move opacity clamping into RenderStyle setter.
https://bugs.webkit.org/show_bug.cgi?id=76966
Reviewed by Eric Seidel.
Covered by existing tests.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyleBitfields::setOpacity):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110661 => 110662)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 02:54:58 UTC (rev 110661)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 03:19:02 UTC (rev 110662)
@@ -1,3 +1,17 @@
+2012-03-13 Luke Macpherson <macpher...@chromium.org>
+
+ Move opacity clamping into RenderStyle setter.
+ https://bugs.webkit.org/show_bug.cgi?id=76966
+
+ Reviewed by Eric Seidel.
+
+ Covered by existing tests.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyleBitfields::setOpacity):
+
2012-03-12 Igor Oliveira <igo...@sisa.samsung.com>
Split the extra logic out of RenderObjectChildList::updateBeforeAfterContent
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (110661 => 110662)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-14 02:54:58 UTC (rev 110661)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-14 03:19:02 UTC (rev 110662)
@@ -3387,11 +3387,7 @@
return;
}
case CSSPropertyOpacity:
- HANDLE_INHERIT_AND_INITIAL(opacity, Opacity)
- if (!primitiveValue || !primitiveValue->isNumber())
- return; // Error case.
- // Clamp opacity to the range 0-1
- m_style->setOpacity(clampTo<float>(primitiveValue->getDoubleValue(), 0, 1));
+ HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(opacity, Opacity)
return;
case CSSPropertySrc: // Only used in @font-face rules.
return;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (110661 => 110662)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-14 02:54:58 UTC (rev 110661)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-14 03:19:02 UTC (rev 110662)
@@ -1224,7 +1224,7 @@
void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w) }
void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c) }
void setColorSpace(ColorSpace space) { SET_VAR(rareInheritedData, colorSpace, space) }
- void setOpacity(float f) { SET_VAR(rareNonInheritedData, opacity, f); }
+ void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }
void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
// For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, align, a); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
