diff options
Diffstat (limited to 'Source/WebCore/rendering/style/StyleInheritedData.cpp')
| -rw-r--r-- | Source/WebCore/rendering/style/StyleInheritedData.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/Source/WebCore/rendering/style/StyleInheritedData.cpp b/Source/WebCore/rendering/style/StyleInheritedData.cpp index 7f2e1c551..a5e357ee9 100644 --- a/Source/WebCore/rendering/style/StyleInheritedData.cpp +++ b/Source/WebCore/rendering/style/StyleInheritedData.cpp @@ -27,10 +27,10 @@ namespace WebCore { StyleInheritedData::StyleInheritedData() - : horizontal_border_spacing(RenderStyle::initialHorizontalBorderSpacing()) - , vertical_border_spacing(RenderStyle::initialVerticalBorderSpacing()) - , line_height(RenderStyle::initialLineHeight()) -#if ENABLE(IOS_TEXT_AUTOSIZING) + : horizontalBorderSpacing(RenderStyle::initialHorizontalBorderSpacing()) + , verticalBorderSpacing(RenderStyle::initialVerticalBorderSpacing()) + , lineHeight(RenderStyle::initialLineHeight()) +#if ENABLE(TEXT_AUTOSIZING) , specifiedLineHeight(RenderStyle::initialLineHeight()) #endif , color(RenderStyle::initialColor()) @@ -38,40 +38,36 @@ StyleInheritedData::StyleInheritedData() { } -StyleInheritedData::~StyleInheritedData() -{ -} - inline StyleInheritedData::StyleInheritedData(const StyleInheritedData& o) : RefCounted<StyleInheritedData>() - , horizontal_border_spacing(o.horizontal_border_spacing) - , vertical_border_spacing(o.vertical_border_spacing) - , line_height(o.line_height) -#if ENABLE(IOS_TEXT_AUTOSIZING) + , horizontalBorderSpacing(o.horizontalBorderSpacing) + , verticalBorderSpacing(o.verticalBorderSpacing) + , lineHeight(o.lineHeight) +#if ENABLE(TEXT_AUTOSIZING) , specifiedLineHeight(o.specifiedLineHeight) #endif - , font(o.font) + , fontCascade(o.fontCascade) , color(o.color) , visitedLinkColor(o.visitedLinkColor) { } -PassRef<StyleInheritedData> StyleInheritedData::copy() const +Ref<StyleInheritedData> StyleInheritedData::copy() const { return adoptRef(*new StyleInheritedData(*this)); } bool StyleInheritedData::operator==(const StyleInheritedData& o) const { - return line_height == o.line_height -#if ENABLE(IOS_TEXT_AUTOSIZING) + return lineHeight == o.lineHeight +#if ENABLE(TEXT_AUTOSIZING) && specifiedLineHeight == o.specifiedLineHeight #endif - && font == o.font + && fontCascade == o.fontCascade && color == o.color && visitedLinkColor == o.visitedLinkColor - && horizontal_border_spacing == o.horizontal_border_spacing - && vertical_border_spacing == o.vertical_border_spacing; + && horizontalBorderSpacing == o.horizontalBorderSpacing + && verticalBorderSpacing == o.verticalBorderSpacing; } } // namespace WebCore |