Revert of Improve performance of GeometryMapper cache.

third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
index c1375c5bf31c7296d1a499fee25528e506d0153d..35ef1a0108a6167f1d37205ac67bcca1f71393dc 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
@@ -31,20 +31,15 @@
     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(
@@ -145,19 +140,19 @@
                        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)
 
@@ -270,9 +265,8 @@
                  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) {
@@ -302,8 +296,10 @@
                  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) {