diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp')
| -rw-r--r-- | Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp b/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp index 3c835923a..1fafa2d88 100644 --- a/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp +++ b/Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp @@ -28,8 +28,8 @@ namespace WebCore { StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData() : flex(RenderStyle::initialBoxFlex()) - , flex_group(RenderStyle::initialBoxFlexGroup()) - , ordinal_group(RenderStyle::initialBoxOrdinalGroup()) + , flexGroup(RenderStyle::initialBoxFlexGroup()) + , ordinalGroup(RenderStyle::initialBoxOrdinalGroup()) , align(RenderStyle::initialBoxAlign()) , pack(RenderStyle::initialBoxPack()) , orient(RenderStyle::initialBoxOrient()) @@ -37,28 +37,28 @@ StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData() { } -inline StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData(const StyleDeprecatedFlexibleBoxData& o) +inline StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData(const StyleDeprecatedFlexibleBoxData& other) : RefCounted<StyleDeprecatedFlexibleBoxData>() - , flex(o.flex) - , flex_group(o.flex_group) - , ordinal_group(o.ordinal_group) - , align(o.align) - , pack(o.pack) - , orient(o.orient) - , lines(o.lines) + , flex(other.flex) + , flexGroup(other.flexGroup) + , ordinalGroup(other.ordinalGroup) + , align(other.align) + , pack(other.pack) + , orient(other.orient) + , lines(other.lines) { } -PassRef<StyleDeprecatedFlexibleBoxData> StyleDeprecatedFlexibleBoxData::copy() const +Ref<StyleDeprecatedFlexibleBoxData> StyleDeprecatedFlexibleBoxData::copy() const { return adoptRef(*new StyleDeprecatedFlexibleBoxData(*this)); } -bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBoxData& o) const +bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBoxData& other) const { - return flex == o.flex && flex_group == o.flex_group && - ordinal_group == o.ordinal_group && align == o.align && - pack == o.pack && orient == o.orient && lines == o.lines; + return flex == other.flex && flexGroup == other.flexGroup + && ordinalGroup == other.ordinalGroup && align == other.align + && pack == other.pack && orient == other.orient && lines == other.lines; } } // namespace WebCore |