Diff
Modified: trunk/Source/WebCore/ChangeLog (208025 => 208026)
--- trunk/Source/WebCore/ChangeLog 2016-10-28 03:20:32 UTC (rev 208025)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 03:21:58 UTC (rev 208026)
@@ -1,5 +1,25 @@
2016-10-27 Simon Fraser <[email protected]>
+ Rename StyleRareNonInheritedData::opacity to m_opacity
+ https://bugs.webkit.org/show_bug.cgi?id=164104
+
+ Reviewed by Dave Hyatt.
+
+ Pure rename.
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayerRepaint):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::opacity):
+ (WebCore::RenderStyle::setOpacity):
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ (WebCore::StyleRareNonInheritedData::hasOpacity):
+
+2016-10-27 Simon Fraser <[email protected]>
+
If an animation's keyframes affect stacking context properties, create stacking context while the animation is running
https://bugs.webkit.org/show_bug.cgi?id=164094
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (208025 => 208026)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-10-28 03:20:32 UTC (rev 208025)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-10-28 03:21:58 UTC (rev 208026)
@@ -795,7 +795,7 @@
return true;
#endif
- if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity) {
+ if (rareNonInheritedData->m_opacity != other.rareNonInheritedData->m_opacity) {
changedContextSensitiveProperties |= ContextSensitivePropertyOpacity;
// Don't return; keep looking for another change.
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (208025 => 208026)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-28 03:20:32 UTC (rev 208025)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-28 03:21:58 UTC (rev 208026)
@@ -907,7 +907,7 @@
void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& logicalBottom) const { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalBottom); }
float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
- float opacity() const { return rareNonInheritedData->opacity; }
+ float opacity() const { return rareNonInheritedData->m_opacity; }
ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
AspectRatioType aspectRatioType() const { return static_cast<AspectRatioType>(rareNonInheritedData->m_aspectRatioType); }
float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenominator(); }
@@ -1514,7 +1514,7 @@
void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }
void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }
void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c); }
- void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }
+ void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, m_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_NESTED_VAR(rareNonInheritedData, m_deprecatedFlexibleBox, align, a); }
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (208025 => 208026)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-28 03:20:32 UTC (rev 208025)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-28 03:21:58 UTC (rev 208026)
@@ -37,7 +37,7 @@
namespace WebCore {
StyleRareNonInheritedData::StyleRareNonInheritedData()
- : opacity(RenderStyle::initialOpacity())
+ : m_opacity(RenderStyle::initialOpacity())
, m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
, m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
, m_perspective(RenderStyle::initialPerspective())
@@ -119,7 +119,7 @@
inline StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInheritedData& o)
: RefCounted<StyleRareNonInheritedData>()
- , opacity(o.opacity)
+ , m_opacity(o.m_opacity)
, m_aspectRatioDenominator(o.m_aspectRatioDenominator)
, m_aspectRatioNumerator(o.m_aspectRatioNumerator)
, m_perspective(o.m_perspective)
@@ -225,7 +225,7 @@
bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
{
- return opacity == o.opacity
+ return m_opacity == o.m_opacity
&& m_aspectRatioDenominator == o.m_aspectRatioDenominator
&& m_aspectRatioNumerator == o.m_aspectRatioNumerator
&& m_perspective == o.m_perspective
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (208025 => 208026)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-28 03:20:32 UTC (rev 208025)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-28 03:21:58 UTC (rev 208026)
@@ -96,11 +96,11 @@
#if ENABLE(FILTERS_LEVEL_2)
bool hasBackdropFilters() const;
#endif
- bool hasOpacity() const { return opacity < 1; }
+ bool hasOpacity() const { return m_opacity < 1; }
bool hasAnimationsOrTransitions() const { return m_animations || m_transitions; }
- float opacity;
+ float m_opacity;
float m_aspectRatioDenominator;
float m_aspectRatioNumerator;
