From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/rendering/style/StyleVisualData.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'Source/WebCore/rendering/style/StyleVisualData.cpp') 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() - , 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::copy() const +Ref StyleVisualData::copy() const { return adoptRef(*new StyleVisualData(*this)); } -- cgit v1.2.1