| 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 712761a642a93751d913156b9fe87ac2d629d85d..7f9625fd4514827099638fe07771fb87a66f7bec 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "platform/PlatformExport.h"
|
| #include "platform/geometry/FloatPoint3D.h"
|
| +#include "platform/graphics/CompositingReasons.h"
|
| #include "platform/transforms/TransformationMatrix.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -31,17 +32,20 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| const TransformationMatrix& matrix,
|
| const FloatPoint3D& origin,
|
| bool flattensInheritedTransform = false,
|
| - unsigned renderingContextID = 0) {
|
| + unsigned renderingContextID = 0,
|
| + CompositingReasons directCompositingReasons = CompositingReasonNone) {
|
| return adoptRef(new TransformPaintPropertyNode(
|
| matrix, origin, std::move(parent), flattensInheritedTransform,
|
| - renderingContextID));
|
| + renderingContextID, directCompositingReasons));
|
| }
|
|
|
| - void update(PassRefPtr<const TransformPaintPropertyNode> parent,
|
| - const TransformationMatrix& matrix,
|
| - const FloatPoint3D& origin,
|
| - bool flattensInheritedTransform = false,
|
| - unsigned renderingContextID = 0) {
|
| + void update(
|
| + PassRefPtr<const TransformPaintPropertyNode> parent,
|
| + const TransformationMatrix& matrix,
|
| + const FloatPoint3D& origin,
|
| + bool flattensInheritedTransform = false,
|
| + unsigned renderingContextID = 0,
|
| + CompositingReasons directCompositingReasons = CompositingReasonNone) {
|
| DCHECK(!isRoot());
|
| DCHECK(parent != this);
|
| m_parent = parent;
|
| @@ -49,6 +53,7 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| m_origin = origin;
|
| m_flattensInheritedTransform = flattensInheritedTransform;
|
| m_renderingContextID = renderingContextID;
|
| + m_directCompositingReasons = directCompositingReasons;
|
| }
|
|
|
| const TransformationMatrix& matrix() const { return m_matrix; }
|
| @@ -66,6 +71,10 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| return m_flattensInheritedTransform;
|
| }
|
|
|
| + bool hasDirectCompositingReasons() const {
|
| + return m_directCompositingReasons != CompositingReasonNone;
|
| + }
|
| +
|
| // 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; }
|
| @@ -75,9 +84,9 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| // The clone function is used by FindPropertiesNeedingUpdate.h for recording
|
| // a transform node before it has been updated, to later detect changes.
|
| PassRefPtr<TransformPaintPropertyNode> clone() const {
|
| - return adoptRef(new TransformPaintPropertyNode(m_matrix, m_origin, m_parent,
|
| - m_flattensInheritedTransform,
|
| - m_renderingContextID));
|
| + return adoptRef(new TransformPaintPropertyNode(
|
| + m_matrix, m_origin, m_parent, m_flattensInheritedTransform,
|
| + m_renderingContextID, m_directCompositingReasons));
|
| }
|
|
|
| // The equality operator is used by FindPropertiesNeedingUpdate.h for checking
|
| @@ -96,18 +105,21 @@ class PLATFORM_EXPORT TransformPaintPropertyNode
|
| const FloatPoint3D& origin,
|
| PassRefPtr<const TransformPaintPropertyNode> parent,
|
| bool flattensInheritedTransform,
|
| - unsigned renderingContextID)
|
| + unsigned renderingContextID,
|
| + CompositingReasons directCompositingReasons)
|
| : m_matrix(matrix),
|
| m_origin(origin),
|
| m_parent(parent),
|
| m_flattensInheritedTransform(flattensInheritedTransform),
|
| - m_renderingContextID(renderingContextID) {}
|
| + m_renderingContextID(renderingContextID),
|
| + m_directCompositingReasons(directCompositingReasons) {}
|
|
|
| TransformationMatrix m_matrix;
|
| FloatPoint3D m_origin;
|
| RefPtr<const TransformPaintPropertyNode> m_parent;
|
| bool m_flattensInheritedTransform;
|
| unsigned m_renderingContextID;
|
| + CompositingReasons m_directCompositingReasons;
|
| };
|
|
|
| // Redeclared here to avoid ODR issues.
|
|
|