Rename and change parameter type of some GeometryMapper methods

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

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
index a9c5296368d5b6805b0ec6ff884a69c85ab2ed97..c9d7a92d114427cbbe4945b2cef262bacb5af6f4 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -286,8 +286,8 @@ static void applyClipsBetweenStates(const PropertyTreeState& localState,
   if (transformNode != ancestorState.transform()) {
     bool success = false;
     const TransformationMatrix& localToAncestorMatrix =
-        geometryMapper.localToAncestorMatrix(transformNode, ancestorState,
-                                             success);
+        geometryMapper.localToAncestorMatrix(
+            transformNode, ancestorState.transform(), success);
     DCHECK(success);
     // Clips are only in descendant spaces that are transformed by one
     // or more scrolls.
@@ -373,8 +373,8 @@ static void recordPairedBeginDisplayItems(
           const TransformPaintPropertyNode* transformNode =
               pairedState->effect()->localTransformSpace();
           const TransformationMatrix& localToAncestorMatrix =
-              geometryMapper.localToAncestorMatrix(transformNode, *pairedState,
-                                                   success);
+              geometryMapper.localToAncestorMatrix(
+                  transformNode, pairedState->transform(), success);
           DCHECK(success);
           // Effects are only in descendant spaces that are transformed by one
           // or more scrolls.
@@ -1081,14 +1081,14 @@ bool PaintArtifactCompositor::mightOverlap(
 
   bool success = false;
   FloatRect paintChunkScreenVisualRect =
-      geometryMapper.localToVisualRectInAncestorSpace(
+      geometryMapper.localToAncestorVisualRect(
           paintChunk.bounds, paintChunk.properties.propertyTreeState,
           rootPropertyTreeState, success);
   DCHECK(success);
 
   success = false;
   FloatRect pendingLayerScreenVisualRect =
-      geometryMapper.localToVisualRectInAncestorSpace(
+      geometryMapper.localToAncestorVisualRect(
           candidatePendingLayer.bounds, candidatePendingLayer.propertyTreeState,
           rootPropertyTreeState, success);
   DCHECK(success);
@@ -1114,8 +1114,8 @@ void PaintArtifactCompositor::PendingLayer::add(
   if (geometryMapper) {
     bool success = false;
     mappedBounds = geometryMapper->localToAncestorRect(
-        mappedBounds, paintChunk.properties.propertyTreeState,
-        propertyTreeState, success);
+        mappedBounds, paintChunk.properties.propertyTreeState.transform(),
+        propertyTreeState.transform(), success);
     DCHECK(success);
   }
   bounds.unite(mappedBounds);