From 73b6d9225867e989b525938adbec5977bc12a506 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Mon, 4 Dec 2017 03:00:53 +0900
Subject: [PATCH] Revert "Initialize scale factor to the last scale factor set
 on any instance"

This reverts commit 15f470fafce35d9d3be555564e704c11078419b9.
---
 src/plasma/private/svg_p.h | 1 -
 src/plasma/svg.cpp         | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/plasma/private/svg_p.h b/src/plasma/private/svg_p.h
index 84b41ecfa..1ad666f30 100644
--- a/src/plasma/private/svg_p.h
+++ b/src/plasma/private/svg_p.h
@@ -97,7 +97,6 @@ public:
 
     static QHash<QString, SharedSvgRenderer::Ptr> s_renderers;
     static QWeakPointer<Theme> s_systemColorsCache;
-    static qreal s_lastScaleFactor;
 
     Svg *q;
     QWeakPointer<Theme> theme;
diff --git a/src/plasma/svg.cpp b/src/plasma/svg.cpp
index 5118501e8..33bb94975 100644
--- a/src/plasma/svg.cpp
+++ b/src/plasma/svg.cpp
@@ -146,7 +146,7 @@ SvgPrivate::SvgPrivate(Svg *svg)
       colorGroup(Plasma::Theme::NormalColorGroup),
       lastModified(0),
       devicePixelRatio(1.0),
-      scaleFactor(s_lastScaleFactor),
+      scaleFactor(1.0),
       status(Svg::Status::Normal),
       multipleImages(false),
       themed(false),
@@ -700,7 +700,6 @@ void SvgPrivate::colorsChanged()
 
 QHash<QString, SharedSvgRenderer::Ptr> SvgPrivate::s_renderers;
 QWeakPointer<Theme> SvgPrivate::s_systemColorsCache;
-qreal SvgPrivate::s_lastScaleFactor = 1.0;
 
 Svg::Svg(QObject *parent)
     : QObject(parent),
@@ -747,7 +746,6 @@ void Svg::setScaleFactor(qreal ratio)
     }
 
     d->scaleFactor = floor(ratio);
-    d->s_lastScaleFactor = d->scaleFactor;
     //not resize() because we want to do it unconditionally
     QRectF rect;