Store compositor element id in paint properties for animated objects.

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

Index: third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
index 1bde92d39531bd4e4e71ac078c9735b819d6256f..46fe21eae7ecc0b87c4fdef6dc8951814e9cf71c 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
@@ -8,6 +8,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatPoint3D.h"
 #include "platform/graphics/CompositingReasons.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -34,10 +35,11 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
       const FloatPoint3D& origin,
       bool flattensInheritedTransform = false,
       unsigned renderingContextID = 0,
-      CompositingReasons directCompositingReasons = CompositingReasonNone) {
+      CompositingReasons directCompositingReasons = CompositingReasonNone,
+      const CompositorElementId& compositorElementId = CompositorElementId()) {
     return adoptRef(new TransformPaintPropertyNode(
         std::move(parent), matrix, origin, flattensInheritedTransform,
-        renderingContextID, directCompositingReasons));
+        renderingContextID, directCompositingReasons, compositorElementId));
   }
 
   void update(
@@ -46,7 +48,8 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
       const FloatPoint3D& origin,
       bool flattensInheritedTransform = false,
       unsigned renderingContextID = 0,
-      CompositingReasons directCompositingReasons = CompositingReasonNone) {
+      CompositingReasons directCompositingReasons = CompositingReasonNone,
+      CompositorElementId compositorElementId = CompositorElementId()) {
     DCHECK(!isRoot());
     DCHECK(parent != this);
     m_parent = parent;
@@ -55,6 +58,7 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
     m_flattensInheritedTransform = flattensInheritedTransform;
     m_renderingContextID = renderingContextID;
     m_directCompositingReasons = directCompositingReasons;
+    m_compositorElementId = compositorElementId;
   }
 
   const TransformationMatrix& matrix() const { return m_matrix; }
@@ -76,6 +80,10 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
     return m_directCompositingReasons != CompositingReasonNone;
   }
 
+  const CompositorElementId& compositorElementId() const {
+    return m_compositorElementId;
+  }
+
   // Content whose transform nodes have a common rendering context ID are 3D
   // sorted. If this is 0, content will not be 3D sorted.
   unsigned renderingContextID() const { return m_renderingContextID; }
@@ -87,7 +95,8 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
   PassRefPtr<TransformPaintPropertyNode> clone() const {
     return adoptRef(new TransformPaintPropertyNode(
         m_parent, m_matrix, m_origin, m_flattensInheritedTransform,
-        m_renderingContextID, m_directCompositingReasons));
+        m_renderingContextID, m_directCompositingReasons,
+        m_compositorElementId));
   }
 
   // The equality operator is used by FindPropertiesNeedingUpdate.h for checking
@@ -97,7 +106,8 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
            m_origin == o.m_origin &&
            m_flattensInheritedTransform == o.m_flattensInheritedTransform &&
            m_renderingContextID == o.m_renderingContextID &&
-           m_directCompositingReasons == o.m_directCompositingReasons;
+           m_directCompositingReasons == o.m_directCompositingReasons &&
+           m_compositorElementId == o.m_compositorElementId;
   }
 #endif
 
@@ -110,13 +120,15 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
       const FloatPoint3D& origin,
       bool flattensInheritedTransform,
       unsigned renderingContextID,
-      CompositingReasons directCompositingReasons)
+      CompositingReasons directCompositingReasons,
+      CompositorElementId compositorElementId)
       : m_parent(parent),
         m_matrix(matrix),
         m_origin(origin),
         m_flattensInheritedTransform(flattensInheritedTransform),
         m_renderingContextID(renderingContextID),
-        m_directCompositingReasons(directCompositingReasons) {}
+        m_directCompositingReasons(directCompositingReasons),
+        m_compositorElementId(compositorElementId) {}
 
   RefPtr<const TransformPaintPropertyNode> m_parent;
   TransformationMatrix m_matrix;
@@ -124,6 +136,7 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
   bool m_flattensInheritedTransform;
   unsigned m_renderingContextID;
   CompositingReasons m_directCompositingReasons;
+  CompositorElementId m_compositorElementId;
 };
 
 // Redeclared here to avoid ODR issues.