Changeset 208026 in webkit

Timestamp:

Oct 27, 2016 8:21:58 PM (7 years ago)

Author:

Simon Fraser

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/RenderStyle.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (2 diffs)
• rendering/style/StyleRareNonInheritedData.cpp (modified) (3 diffs)
• rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -796 +796 @@
 #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.

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -908 +908 @@
 
     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); }
@@ -1515 +1515 @@
     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

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -38 +38 @@
 
 StyleRareNonInheritedData::StyleRareNonInheritedData()
-    : opacity(RenderStyle::initialOpacity())
+    : m_opacity(RenderStyle::initialOpacity())
     , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
     , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
@@ -120 +120 @@
 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)
@@ -226 +226 @@
 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

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

@@ -97 +97 @@
     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;