webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 13 deletions

diff --git a/Source/WebCore/rendering/style/StyleVisualData.cpp b/Source/WebCore/rendering/style/StyleVisualData.cpp
index 23e6cd225..10fd5888f 100644
--- a/Source/WebCore/rendering/style/StyleVisualData.cpp
+++ b/Source/WebCore/rendering/style/StyleVisualData.cpp
@@ -29,10 +29,7 @@ namespace WebCore {
 StyleVisualData::StyleVisualData()
     : hasClip(false)
     , textDecoration(RenderStyle::initialTextDecoration())
-#if ENABLE(TEXT_AUTOSIZING)
-    , m_textAutosizingMultiplier(1)
-#endif
-    , m_zoom(RenderStyle::initialZoom())
+    , zoom(RenderStyle::initialZoom())
 {
 }
 
@@ -40,19 +37,16 @@ StyleVisualData::~StyleVisualData()
 {
 }
 
-inline StyleVisualData::StyleVisualData(const StyleVisualData& o)
+inline StyleVisualData::StyleVisualData(const StyleVisualData& other)
     : RefCounted<StyleVisualData>()
-    , clip(o.clip)
-    , hasClip(o.hasClip)
-    , textDecoration(o.textDecoration)
-#if ENABLE(TEXT_AUTOSIZING)
-    , m_textAutosizingMultiplier(o.m_textAutosizingMultiplier)
-#endif
-    , m_zoom(RenderStyle::initialZoom())
+    , clip(other.clip)
+    , hasClip(other.hasClip)
+    , textDecoration(other.textDecoration)
+    , zoom(RenderStyle::initialZoom())
 {
 }
 
-PassRef<StyleVisualData> StyleVisualData::copy() const
+Ref<StyleVisualData> StyleVisualData::copy() const
 {
     return adoptRef(*new StyleVisualData(*this));
 }