[SPInvalidation] Fix paint offset issue of descendants of composited svg root

third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp

Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
index 11af26372097f6b2de63f7de1c718d6f8da8241f..43fcf6e99984d75ddf7f33fcf95d7825253fb432 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
@@ -6,18 +6,24 @@
 
 namespace blink {
 
-void ObjectPaintProperties::getContentsProperties(GeometryPropertyTreeState& properties) const
+void ObjectPaintProperties::getContentsPropertyTreeState(GeometryPropertyTreeState& state, LayoutPoint& paintOffsetFromState) const
 {
-    properties = localBorderBoxProperties()->geometryPropertyTreeState;
-    if (scrollTranslation())
-        properties.transform = scrollTranslation();
-    else if (svgLocalToBorderBoxTransform())
-        properties.transform = svgLocalToBorderBoxTransform();
+    state = localBorderBoxProperties()->geometryPropertyTreeState;
+    if (svgLocalToBorderBoxTransform()) {
+        state.transform = svgLocalToBorderBoxTransform();
+        // No paint offset from the state because svgLocalToBorderTransform
+        // embeds the paint offset in it.
+        paintOffsetFromState = LayoutPoint();
+    } else {
+        if (scrollTranslation())
+            state.transform = scrollTranslation();
+        paintOffsetFromState = localBorderBoxProperties()->paintOffset;
+    }
 
     if (overflowClip())
-        properties.clip = overflowClip();
+        state.clip = overflowClip();
     else if (cssClip())
-        properties.clip = cssClip();
+        state.clip = cssClip();
     // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow.
 }