Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Unified Diff: Source/core/css/CSSCrossfadeValue.h

Issue 1303173007: Oilpan: Unship Oilpan from CSSValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSCounterValue.cpp ('k') | Source/core/css/CSSCrossfadeValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSCrossfadeValue.h
diff --git a/Source/core/css/CSSCrossfadeValue.h b/Source/core/css/CSSCrossfadeValue.h
index 926bae0d2ce1839908b08adbfed929f0fb3450f5..2390b7e5d541416a406ef77361916976423f9d75 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 PassRefPtr<CSSCrossfadeValue> create(PassRefPtr<CSSValue> fromValue, PassRefPtr<CSSValue> toValue)
{
- return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue));
+ return adoptRef(new CSSCrossfadeValue(fromValue, toValue));
}
~CSSCrossfadeValue();
@@ -60,21 +60,14 @@ public:
void loadSubimages(Document*);
- void setPercentage(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue) { m_percentageValue = percentageValue; }
+ void setPercentage(PassRefPtr<CSSPrimitiveValue> percentageValue) { m_percentageValue = percentageValue; }
bool hasFailedOrCanceledSubresources() const;
bool equals(const CSSCrossfadeValue&) const;
- // 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)
+ CSSCrossfadeValue(PassRefPtr<CSSValue> fromValue, PassRefPtr<CSSValue> toValue)
: CSSImageGeneratorValue(CrossfadeClass)
, m_fromValue(fromValue)
, m_toValue(toValue)
@@ -90,23 +83,19 @@ private:
, m_ready(false) { }
~CrossfadeSubimageObserverProxy() override { }
- DEFINE_INLINE_TRACE()
- {
- visitor->trace(m_ownerValue);
- }
void imageChanged(ImageResource*, const IntRect* = nullptr) override;
void setReady(bool ready) { m_ready = ready; }
private:
- RawPtrWillBeMember<CSSCrossfadeValue> m_ownerValue;
+ RawPtr<CSSCrossfadeValue> m_ownerValue;
bool m_ready;
};
void crossfadeChanged(const IntRect&);
- RefPtrWillBeMember<CSSValue> m_fromValue;
- RefPtrWillBeMember<CSSValue> m_toValue;
- RefPtrWillBeMember<CSSPrimitiveValue> m_percentageValue;
+ RefPtr<CSSValue> m_fromValue;
+ RefPtr<CSSValue> m_toValue;
+ RefPtr<CSSPrimitiveValue> m_percentageValue;
ResourcePtr<ImageResource> m_cachedFromImage;
ResourcePtr<ImageResource> m_cachedToImage;
« no previous file with comments | « Source/core/css/CSSCounterValue.cpp ('k') | Source/core/css/CSSCrossfadeValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698