summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp')
-rw-r--r--Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp b/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
index 775886b6e..a8218445a 100644
--- a/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
+++ b/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
@@ -31,33 +31,33 @@
namespace WebCore {
StyleFlexibleBoxData::StyleFlexibleBoxData()
- : m_flexGrow(RenderStyle::initialFlexGrow())
- , m_flexShrink(RenderStyle::initialFlexShrink())
- , m_flexBasis(RenderStyle::initialFlexBasis())
- , m_flexDirection(RenderStyle::initialFlexDirection())
- , m_flexWrap(RenderStyle::initialFlexWrap())
+ : flexGrow(RenderStyle::initialFlexGrow())
+ , flexShrink(RenderStyle::initialFlexShrink())
+ , flexBasis(RenderStyle::initialFlexBasis())
+ , flexDirection(RenderStyle::initialFlexDirection())
+ , flexWrap(RenderStyle::initialFlexWrap())
{
}
-inline StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o)
+inline StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& other)
: RefCounted<StyleFlexibleBoxData>()
- , m_flexGrow(o.m_flexGrow)
- , m_flexShrink(o.m_flexShrink)
- , m_flexBasis(o.m_flexBasis)
- , m_flexDirection(o.m_flexDirection)
- , m_flexWrap(o.m_flexWrap)
+ , flexGrow(other.flexGrow)
+ , flexShrink(other.flexShrink)
+ , flexBasis(other.flexBasis)
+ , flexDirection(other.flexDirection)
+ , flexWrap(other.flexWrap)
{
}
-PassRef<StyleFlexibleBoxData> StyleFlexibleBoxData::copy() const
+Ref<StyleFlexibleBoxData> StyleFlexibleBoxData::copy() const
{
return adoptRef(*new StyleFlexibleBoxData(*this));
}
-bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& o) const
+bool StyleFlexibleBoxData::operator==(const StyleFlexibleBoxData& other) const
{
- return m_flexGrow == o.m_flexGrow && m_flexShrink == o.m_flexShrink && m_flexBasis == o.m_flexBasis
- && m_flexDirection == o.m_flexDirection && m_flexWrap == o.m_flexWrap;
+ return flexGrow == other.flexGrow && flexShrink == other.flexShrink && flexBasis == other.flexBasis
+ && flexDirection == other.flexDirection && flexWrap == other.flexWrap;
}
}