| 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 16e5bbb8766738271b953e106261b054bf01f7a3..ac154b2fd9476c4082efd0412e174d3d7451101d 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.h
|
| @@ -29,13 +29,12 @@
|
| #include "core/CoreExport.h"
|
| #include "core/css/CSSImageGeneratorValue.h"
|
| #include "core/css/CSSPrimitiveValue.h"
|
| -#include "core/fetch/ImageResource.h"
|
| +#include "core/fetch/ImageResourceContent.h"
|
| #include "core/fetch/ImageResourceObserver.h"
|
| #include "platform/graphics/Image.h"
|
|
|
| namespace blink {
|
|
|
| -class ImageResource;
|
| class CrossfadeSubimageObserverProxy;
|
| class LayoutObject;
|
|
|
| @@ -88,7 +87,7 @@ class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue {
|
| ~CrossfadeSubimageObserverProxy() override {}
|
| DEFINE_INLINE_TRACE() { visitor->trace(m_ownerValue); }
|
|
|
| - void imageChanged(ImageResource*, const IntRect* = nullptr) override;
|
| + void imageChanged(ImageResourceContent*, const IntRect* = nullptr) override;
|
| bool willRenderImage() override;
|
| String debugName() const override {
|
| return "CrossfadeSubimageObserverProxy";
|
| @@ -107,8 +106,8 @@ class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue {
|
| Member<CSSValue> m_toValue;
|
| Member<CSSPrimitiveValue> m_percentageValue;
|
|
|
| - Member<ImageResource> m_cachedFromImage;
|
| - Member<ImageResource> m_cachedToImage;
|
| + Member<ImageResourceContent> m_cachedFromImage;
|
| + Member<ImageResourceContent> m_cachedToImage;
|
|
|
| CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver;
|
| };
|
|
|