| Index: third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| index 719803907cf591a63eedc74c253e200a567dba65..1389fc6cd50e8b5d764e6a14abcd8842082f1b41 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| @@ -41,6 +41,7 @@ class LayoutObject;
|
|
|
| class CSSCrossfadeValue final : public CSSImageGeneratorValue {
|
| friend class CrossfadeSubimageObserverProxy;
|
| + WILL_BE_USING_PRE_FINALIZER(CSSCrossfadeValue, dispose);
|
| public:
|
| static PassRefPtrWillBeRawPtr<CSSCrossfadeValue> create(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue)
|
| {
|
| @@ -66,22 +67,12 @@ public:
|
|
|
| PassRefPtrWillBeRawPtr<CSSCrossfadeValue> valueWithURLsMadeAbsolute();
|
|
|
| - // Promptly remove as a ImageResource client.
|
| - EAGERLY_FINALIZE();
|
| -#if ENABLE(OILPAN)
|
| - DECLARE_EAGER_FINALIZATION_OPERATOR_NEW();
|
| -#endif
|
| DECLARE_TRACE_AFTER_DISPATCH();
|
|
|
| private:
|
| - CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue)
|
| - : CSSImageGeneratorValue(CrossfadeClass)
|
| - , m_fromValue(fromValue)
|
| - , m_toValue(toValue)
|
| - , m_percentageValue(percentageValue)
|
| - , m_cachedFromImage(nullptr)
|
| - , m_cachedToImage(nullptr)
|
| - , m_crossfadeSubimageObserver(this) { }
|
| + CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue);
|
| +
|
| + void dispose();
|
|
|
| class CrossfadeSubimageObserverProxy final : public ImageResourceClient {
|
| DISALLOW_NEW();
|
|
|