Chromium Code Reviews| Index: Source/core/css/CSSCrossfadeValue.h |
| diff --git a/Source/core/css/CSSCrossfadeValue.h b/Source/core/css/CSSCrossfadeValue.h |
| index e54afe5a415b66e83ec8de90712b4dc8c58808ec..e0d9f2e455ff942d8839eedd02d0cad9ac640af8 100644 |
| --- a/Source/core/css/CSSCrossfadeValue.h |
| +++ b/Source/core/css/CSSCrossfadeValue.h |
| @@ -42,9 +42,9 @@ class LayoutObject; |
| class CSSCrossfadeValue final : public CSSImageGeneratorValue { |
| friend class CrossfadeSubimageObserverProxy; |
| public: |
| - static PassRefPtrWillBeRawPtr<CSSCrossfadeValue> create(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue) |
| + static PassRefPtrWillBeRawPtr<CSSCrossfadeValue> create(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue = nullptr) |
|
Timothy Loh
2015/09/15 12:20:47
Better to do this change separately and properly (
nainar
2015/09/16 07:16:49
Done.
|
| { |
| - return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue)); |
| + return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue, percentageValue)); |
| } |
| ~CSSCrossfadeValue(); |
| @@ -66,6 +66,8 @@ public: |
| bool equals(const CSSCrossfadeValue&) const; |
| + PassRefPtrWillBeRawPtr<CSSCrossfadeValue> valueWithAbsoluteURL(); |
| + |
| // Promptly remove as a ImageResource client. |
| EAGERLY_FINALIZE(); |
| #if ENABLE(OILPAN) |
| @@ -74,12 +76,13 @@ public: |
| DECLARE_TRACE_AFTER_DISPATCH(); |
| private: |
| - CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue) |
| + CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue) |
| : CSSImageGeneratorValue(CrossfadeClass) |
| , m_fromValue(fromValue) |
| , m_toValue(toValue) |
| - , m_cachedFromImage(nullptr) |
| - , m_cachedToImage(nullptr) |
| + , m_percentageValue(percentageValue) |
| + , m_cachedFromImage(0) |
|
Timothy Loh
2015/09/15 12:20:47
Why the change?
nainar
2015/09/16 07:16:49
Fixed.
|
| + , m_cachedToImage(0) |
| , m_crossfadeSubimageObserver(this) { } |
| class CrossfadeSubimageObserverProxy final : public ImageResourceClient { |