[SPv2] Fix PaintArtifactCompositor clip layer origin undo order

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/layer.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/testing/PictureMatchers.h"
@@ skipping 126 matching lines @@
     {
         const cc::Layer* layer = rootLayer()->child_at(1);
         EXPECT_THAT(layer->GetPicture(),
             Pointee(drawsRectangle(FloatRect(0, 0, 300, 200), Color::black)));
         gfx::RectF mappedRect(0, 0, 300, 200);
         layer->transform().TransformRect(&mappedRect);
         EXPECT_EQ(gfx::RectF(0, 0, 600, 400), mappedRect);
     }
 }
 
+TEST_F(PaintArtifactCompositorTest, LayerOriginCancellation)
+{
+    RefPtr<ClipPaintPropertyNode> clip = ClipPaintPropertyNode::create(
+        nullptr, FloatRoundedRect(100, 100, 100, 100));
+    RefPtr<TransformPaintPropertyNode> transform = TransformPaintPropertyNode::create(
+        TransformationMatrix().scale(2), FloatPoint3D());
+
+    TestPaintArtifact artifact;
+    artifact.chunk(transform, clip, nullptr)
+        .rectDrawing(FloatRect(12, 34, 56, 78), Color::white);
+    update(artifact.build());
+
+    ASSERT_EQ(1u, rootLayer()->children().size());
+    cc::Layer* clipLayer = rootLayer()->child_at(0);
+    EXPECT_EQ(gfx::Size(100, 100), clipLayer->bounds());
+    EXPECT_EQ(translation(100, 100), clipLayer->transform());
+    EXPECT_TRUE(clipLayer->masks_to_bounds());
+
+    ASSERT_EQ(1u, clipLayer->children().size());
+    cc::Layer* layer = clipLayer->child_at(0);
+    EXPECT_EQ(gfx::Size(56, 78), layer->bounds());
+    gfx::Transform expectedTransform;
+    expectedTransform.Translate(-100, -100);
+    expectedTransform.Scale(2, 2);
+    expectedTransform.Translate(12, 34);
+    EXPECT_EQ(expectedTransform, layer->transform());
+}
+
 TEST_F(PaintArtifactCompositorTest, OneClip)
 {
     RefPtr<ClipPaintPropertyNode> clip = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(100, 100, 300, 200));
 
     TestPaintArtifact artifact;
     artifact.chunk(nullptr, clip, nullptr)
         .rectDrawing(FloatRect(220, 80, 300, 200), Color::black);
     update(artifact.build());
 
@@ skipping 159 matching lines @@
     update(artifact.build());
 
     ASSERT_EQ(1u, rootLayer()->children().size());
     EXPECT_EQ(layer, rootLayer()->child_at(0));
     EXPECT_EQ(gfx::Size(400, 300), layer->bounds());
     EXPECT_EQ(translation(50, 100), layer->transform());
 }
 
 } // namespace
 } // namespace blink