| Index: Source/core/css/CSSImageValue.h
|
| diff --git a/Source/core/css/CSSImageValue.h b/Source/core/css/CSSImageValue.h
|
| index 9019164dc9faad43d516699fbb17060e31a8ad31..b21861331ce5dfc1368d5977ca3676625587b5f3 100644
|
| --- a/Source/core/css/CSSImageValue.h
|
| +++ b/Source/core/css/CSSImageValue.h
|
| @@ -36,13 +36,13 @@ class LayoutObject;
|
|
|
| class CSSImageValue : public CSSValue {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<CSSImageValue> create(const KURL& url, StyleImage* image = 0)
|
| + static PassRefPtr<CSSImageValue> create(const KURL& url, StyleImage* image = 0)
|
| {
|
| - return adoptRefWillBeNoop(new CSSImageValue(url, url, image));
|
| + return adoptRef(new CSSImageValue(url, url, image));
|
| }
|
| - static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
|
| + static PassRefPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
|
| {
|
| - return adoptRefWillBeNoop(new CSSImageValue(rawValue, url, image));
|
| + return adoptRef(new CSSImageValue(rawValue, url, image));
|
| }
|
| ~CSSImageValue();
|
|
|
| @@ -68,7 +68,6 @@ public:
|
|
|
| void setInitiator(const AtomicString& name) { m_initiatorName = name; }
|
|
|
| - DECLARE_TRACE_AFTER_DISPATCH();
|
| void restoreCachedResourceIfNeeded(Document&);
|
|
|
| private:
|
| @@ -77,7 +76,7 @@ private:
|
| String m_relativeURL;
|
| String m_absoluteURL;
|
| Referrer m_referrer;
|
| - RefPtrWillBeMember<StyleImage> m_image;
|
| + RefPtrWillBePersistent<StyleImage> m_image;
|
| bool m_accessedImage;
|
| AtomicString m_initiatorName;
|
| };
|
|
|