| 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 2c4af5f7c4e4ac6652fa2faeee09b2552dc4eb6d..4dc668866e2d5f8c2ddfdbd4795b6461abcf953f 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/TransformPaintPropertyNode.h
|
| @@ -7,10 +7,8 @@
|
|
|
| #include "platform/PlatformExport.h"
|
| #include "platform/geometry/FloatPoint3D.h"
|
| +#include "platform/graphics/paint/PaintPropertyNode.h"
|
| #include "platform/transforms/TransformationMatrix.h"
|
| -#include "wtf/PassRefPtr.h"
|
| -#include "wtf/RefCounted.h"
|
| -#include "wtf/RefPtr.h"
|
|
|
| #include <iosfwd>
|
|
|
| @@ -19,7 +17,7 @@ namespace blink {
|
| // A transform created by a css property such as "transform" or "perspective"
|
| // along with a reference to the parent TransformPaintPropertyNode, or nullptr
|
| // for the root.
|
| -class PLATFORM_EXPORT TransformPaintPropertyNode : public RefCounted<TransformPaintPropertyNode> {
|
| +class PLATFORM_EXPORT TransformPaintPropertyNode : public PaintPropertyNode<TransformPaintPropertyNode> {
|
| public:
|
| struct Value {
|
| Value() { }
|
| @@ -45,19 +43,11 @@ public:
|
| const TransformationMatrix& matrix() const { return m_value.matrix; }
|
| const FloatPoint3D& origin() const { return m_value.origin; }
|
|
|
| - // Parent transform that this transform is relative to, or nullptr if this
|
| - // is the root transform.
|
| - TransformPaintPropertyNode* parent() const { return m_parent.get(); }
|
| -
|
| - // Moves this node and its subtrees under another parent.
|
| - void setParent(PassRefPtr<TransformPaintPropertyNode> parent) { m_parent = parent; }
|
| -
|
| private:
|
| TransformPaintPropertyNode(const Value& value, PassRefPtr<TransformPaintPropertyNode> parent)
|
| - : m_value(value), m_parent(parent) { }
|
| + : PaintPropertyNode(parent), m_value(value) { }
|
|
|
| Value m_value;
|
| - RefPtr<TransformPaintPropertyNode> m_parent;
|
| };
|
|
|
| // Redeclared here to avoid ODR issues.
|
|
|