Ensure display items are unique when multiple nested clip paths are used

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp

Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
index 1e013a58530c6b2a5bd1d9ae34e20c6712c75dbe..81ca65d837d17d0dee396eb5994200beb9c08c89 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
@@ -158,27 +158,18 @@ bool LayoutSVGResourceClipper::asPath(const AffineTransform& animatedLocalTransf
     return true;
 }
 
-PassRefPtr<const SkPicture> LayoutSVGResourceClipper::createContentPicture(AffineTransform& contentTransformation, const FloatRect& targetBoundingBox,

[chrishtr, 2016/03/29 17:59:04]

SVGMaskPainter also calls this method, does that code need to be updated?

[pdr., 2016/03/29 18:06:15]

We should be good there, as SVGMaskPainter only calls
LayoutSVGResourceMasker::createContentPicture.

-    GraphicsContext& context)
+PassRefPtr<const SkPicture> LayoutSVGResourceClipper::createContentPicture()
 {
     ASSERT(frame());
-
-    if (clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
-        contentTransformation.translate(targetBoundingBox.x(), targetBoundingBox.y());
-        contentTransformation.scaleNonUniform(targetBoundingBox.width(), targetBoundingBox.height());
-    }
-
     if (m_clipContentPicture)
         return m_clipContentPicture;
 
-    SubtreeContentTransformScope contentTransformScope(contentTransformation);
-
     // Using strokeBoundingBox (instead of paintInvalidationRectInLocalCoordinates) to avoid the intersection
     // with local clips/mask, which may yield incorrect results when mixing objectBoundingBox and
     // userSpaceOnUse units (http://crbug.com/294900).
     FloatRect bounds = strokeBoundingBox();
 
-    SkPictureBuilder pictureBuilder(bounds, nullptr, &context);
+    SkPictureBuilder pictureBuilder(bounds, nullptr, nullptr);
 
     for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
         LayoutObject* layoutObject = childElement->layoutObject();