Revert of Improve performance of GeometryMapper cache.

third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.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/paint/GeometryMapper.h"
 
 #include "platform/geometry/GeometryTestHelpers.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/BoxReflection.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
@@ skipping 13 matching lines @@
 
   std::unique_ptr<GeometryMapper> geometryMapper;
 
   PropertyTreeState rootPropertyTreeState() {
     PropertyTreeState state(TransformPaintPropertyNode::root(),
                             ClipPaintPropertyNode::root(),
                             EffectPaintPropertyNode::root());
     return state;
   }
 
-  const FloatClipRect* getClip(
-      const ClipPaintPropertyNode* descendantClip,
-      const PropertyTreeState& ancestorPropertyTreeState) {
-    GeometryMapperClipCache::ClipAndTransform clipAndTransform(
-        ancestorPropertyTreeState.clip(),
-        ancestorPropertyTreeState.transform());
-    return descendantClip->getClipCache().getCachedClip(clipAndTransform);
+  GeometryMapper::TransformCache& getTransformCache(
+      const PropertyTreeState& propertyTreeState) {
+    return geometryMapper->getTransformCache(propertyTreeState.transform());
   }
 
-  const TransformationMatrix* getTransform(
-      const TransformPaintPropertyNode* descendantTransform,
-      const TransformPaintPropertyNode* ancestorTransform) {
-    return descendantTransform->getTransformCache().getCachedTransform(
-        ancestorTransform);
+  GeometryMapper::ClipCache& getClipCache(
+      const PropertyTreeState& propertyTreeState) {
+    return geometryMapper->getClipCache(propertyTreeState.clip(),
+                                        propertyTreeState.transform());
   }
 
   const TransformPaintPropertyNode* lowestCommonAncestor(
       const TransformPaintPropertyNode* a,
       const TransformPaintPropertyNode* b) {
     return GeometryMapper::lowestCommonAncestor(a, b);
   }
 
   FloatRect sourceToDestinationVisualRectInternal(
       const FloatRect& rect,
@@ skipping 80 matching lines @@
     EXPECT_RECT_EQ(expectedTransformedRect,                                    \
                    geometryMapper->localToAncestorRect(                        \
                        inputRect, localPropertyTreeState.transform(),          \
                        ancestorPropertyTreeState.transform()));                \
     EXPECT_RECT_EQ(expectedTransformedRect,                                    \
                    geometryMapper->sourceToDestinationRect(                    \
                        inputRect, localPropertyTreeState.transform(),          \
                        ancestorPropertyTreeState.transform()));                \
     if (ancestorPropertyTreeState.transform() !=                               \
         localPropertyTreeState.transform()) {                                  \
-      const TransformationMatrix* transformForTesting =                        \
-          getTransform(localPropertyTreeState.transform(),                     \
-                       ancestorPropertyTreeState.transform());                 \
-      CHECK(transformForTesting);                                              \
-      EXPECT_EQ(expectedTransformToAncestor, *transformForTesting);            \
+      EXPECT_EQ(expectedTransformToAncestor,                                   \
+                getTransformCache(ancestorPropertyTreeState)                   \
+                    .at(localPropertyTreeState.transform()));                  \
     }                                                                          \
     if (ancestorPropertyTreeState.clip() != localPropertyTreeState.clip()) {   \
-      const FloatClipRect* outputClipForTesting =                              \
-          getClip(localPropertyTreeState.clip(), ancestorPropertyTreeState);   \
-      DCHECK(outputClipForTesting);                                            \
-      EXPECT_EQ(expectedClipInAncestorSpace, *outputClipForTesting)            \
+      EXPECT_EQ(expectedClipInAncestorSpace,                                   \
+                getClipCache(ancestorPropertyTreeState)                        \
+                    .at(localPropertyTreeState.clip()))                        \
           << expectedClipInAncestorSpace.rect().toString() << " "              \
-          << outputClipForTesting->rect().toString();                          \
+          << getClipCache(ancestorPropertyTreeState)                           \
+                 .at(localPropertyTreeState.clip())                            \
+                 .rect()                                                       \
+                 .toString();                                                  \
     }                                                                          \
   } while (false)
 
 TEST_F(GeometryMapperTest, Root) {
   FloatRect input(0, 0, 100, 100);
 
   bool hasRadius = false;
   CHECK_MAPPINGS(input, input, input,
                  TransformPaintPropertyNode::root()->matrix(), FloatClipRect(),
                  rootPropertyTreeState(), rootPropertyTreeState(), hasRadius);
@@ skipping 92 matching lines @@
 
   FloatRect input(0, 0, 100, 100);
   TransformationMatrix final = rotateTransform * scaleTransform;
   FloatRect output = final.mapRect(input);
 
   bool hasRadius = false;
   CHECK_MAPPINGS(input, output, output, final, FloatClipRect(), localState,
                  rootPropertyTreeState(), hasRadius);
 
   // Check the cached matrix for the intermediate transform.
-  EXPECT_EQ(
-      rotateTransform,
-      *getTransform(transform1.get(), rootPropertyTreeState().transform()));
+  EXPECT_EQ(rotateTransform,
+            getTransformCache(rootPropertyTreeState()).at(transform1.get()));
 }
 
 TEST_F(GeometryMapperTest, NestedTransformsScaleAndTranslation) {
   TransformationMatrix scaleTransform;
   scaleTransform.scale(2);
   RefPtr<TransformPaintPropertyNode> transform1 =
       TransformPaintPropertyNode::create(rootPropertyTreeState().transform(),
                                          scaleTransform, FloatPoint3D());
 
   TransformationMatrix translateTransform;
   translateTransform.translate(100, 0);
   RefPtr<TransformPaintPropertyNode> transform2 =
       TransformPaintPropertyNode::create(transform1, translateTransform,
                                          FloatPoint3D());
 
   PropertyTreeState localState = rootPropertyTreeState();
   localState.setTransform(transform2.get());
 
   FloatRect input(0, 0, 100, 100);
   // Note: unlike NestedTransforms, the order of these transforms matters. This
   // tests correct order of matrix multiplication.
   TransformationMatrix final = scaleTransform * translateTransform;
   FloatRect output = final.mapRect(input);
 
   bool hasRadius = false;
   CHECK_MAPPINGS(input, output, output, final, FloatClipRect(), localState,
                  rootPropertyTreeState(), hasRadius);
 
   // Check the cached matrix for the intermediate transform.
-  EXPECT_EQ(scaleTransform, *getTransform(transform1.get(),
-                                          rootPropertyTreeState().transform()));
+  EXPECT_EQ(scaleTransform,
+            getTransformCache(rootPropertyTreeState())
+
+                .at(transform1.get()));
 }
 
 TEST_F(GeometryMapperTest, NestedTransformsIntermediateDestination) {
   TransformationMatrix rotateTransform;
   rotateTransform.rotate(45);
   RefPtr<TransformPaintPropertyNode> transform1 =
       TransformPaintPropertyNode::create(rootPropertyTreeState().transform(),
                                          rotateTransform, FloatPoint3D());
 
   TransformationMatrix scaleTransform;
@@ skipping 518 matching lines @@
   FloatRect input(100, 100, 50, 50);
   // Reflection is at (50, 100, 50, 50).
   FloatRect output(50, 100, 100, 50);
 
   bool hasRadius = false;
   CHECK_MAPPINGS(input, output, input, TransformationMatrix(), FloatClipRect(),
                  localState, rootPropertyTreeState(), hasRadius);
 }
 
 }  // namespace blink