| Index: third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.h b/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.h
|
| index d0d51bfbf7170e51ff9963fc4d53911600e7fa46..6a98d168ad52a55fe8c491f8780ff0fe47b3fa82 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.h
|
| @@ -6,9 +6,7 @@
|
| #define EffectPaintPropertyNode_h
|
|
|
| #include "platform/PlatformExport.h"
|
| -#include "wtf/PassRefPtr.h"
|
| -#include "wtf/RefCounted.h"
|
| -#include "wtf/RefPtr.h"
|
| +#include "platform/graphics/paint/PaintPropertyNode.h"
|
|
|
| #include <iosfwd>
|
|
|
| @@ -17,7 +15,7 @@ namespace blink {
|
| // A paint effect created by the opacity css property along with a reference to
|
| // the parent effect node, or nullptr for the root.
|
| // TODO(pdr): Support more effects than just opacity.
|
| -class PLATFORM_EXPORT EffectPaintPropertyNode : public RefCounted<EffectPaintPropertyNode> {
|
| +class PLATFORM_EXPORT EffectPaintPropertyNode : public PaintPropertyNode<EffectPaintPropertyNode> {
|
| public:
|
| using Value = float;
|
|
|
| @@ -29,18 +27,11 @@ public:
|
| Value value() const { return m_opacity; }
|
| float opacity() const { return m_opacity; }
|
|
|
| - // Parent effect or nullptr if this is the root effect.
|
| - const EffectPaintPropertyNode* parent() const { return m_parent.get(); }
|
| -
|
| - // Moves this node and its subtrees under another parent.
|
| - void setParent(PassRefPtr<EffectPaintPropertyNode> parent) { m_parent = parent; }
|
| -
|
| private:
|
| EffectPaintPropertyNode(float opacity, PassRefPtr<EffectPaintPropertyNode> parent)
|
| - : m_opacity(opacity), m_parent(parent) { }
|
| + : PaintPropertyNode(parent), m_opacity(opacity) { }
|
|
|
| const float m_opacity;
|
| - RefPtr<EffectPaintPropertyNode> m_parent;
|
| };
|
|
|
| // Redeclared here to avoid ODR issues.
|
|
|