From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 .../WebCore/rendering/style/StyleInheritedData.cpp | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'Source/WebCore/rendering/style/StyleInheritedData.cpp')

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
-- 
cgit v1.2.1