Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / RenderSVGResourceMarker.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.cpp b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
index cb2afa5..e8943ca 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
@@ -52,10 +52,6 @@ void RenderSVGResourceMarker::layout()
     LayoutRectRecorder recorder(*this);
     TemporaryChange<bool> inLayoutChange(m_isInLayout, true);
 
-    // Invalidate all resources if our layout changed.
-    if (everHadLayout() && selfNeedsLayout())
-        removeAllClientsFromCache();
-
     // RenderSVGHiddenContainer overwrites layout(). We need the
     // layouting of RenderSVGContainer for calculating  local
     // transformations and repaint.
@@ -146,8 +142,11 @@ void RenderSVGResourceMarker::draw(PaintInfo& paintInfo, const AffineTransform&
         return;
 
     PaintInfo info(paintInfo);
-    GraphicsContextStateSaver stateSaver(*info.context);
-    info.applyTransform(transform);
+    GraphicsContextStateSaver stateSaver(*info.context, false);
+    if (!transform.isIdentity()) {
+        stateSaver.save();
+        info.applyTransform(transform, false);
+    }
     RenderSVGContainer::paint(info, IntPoint());
 }