Implement merging non-composited paint property nodes in the PACompositor.

third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h

Index: third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h
index 7df60f2010466491e519959606ca4ccbe6e64a86..b12dcffd4cced61d6b76ee6fe2182fc08e62942a 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h
@@ -117,6 +117,14 @@ class PLATFORM_EXPORT GeometryMapper {
                                 const PropertyTreeState& ancestorState,
                                 bool& success);
 
+  // Returns the matrix used in |LocalToAncestorRect|. Sets |success| to false
+  // iff |localTransformNode| is not equal to or a descendant of
+  // |ancestorState.transform|.
+  const TransformationMatrix& localToAncestorMatrix(
+      const TransformPaintPropertyNode* localTransformNode,
+      const PropertyTreeState& ancestorState,
+      bool& success);
+
  private:
   // Used by mapToVisualRectInDestinationSpace() after fast mapping (assuming
   // destination is an ancestor of source) failed.
@@ -134,14 +142,6 @@ class PLATFORM_EXPORT GeometryMapper {
       const PropertyTreeState& destinationState,
       bool& success);
 
-  // Returns the matrix used in |LocalToAncestorRect|. Sets |success| to false
-  // iff |localTransformNode| is not equal to or a descendant of
-  // |ancestorState.transform|.
-  const TransformationMatrix& localToAncestorMatrix(
-      const TransformPaintPropertyNode* localTransformNode,
-      const PropertyTreeState& ancestorState,
-      bool& success);
-
   // Returns the "clip visual rect" between |localTransformState| and
   // |ancestorState|. See above for the definition of "clip visual rect".
   FloatRect localToAncestorClipRect(