| Index: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h
|
| index 60c1ead7c6d7daa2405f120fbda4f5988663b8d5..2a9f722ba36b61d8e0b0800eabd0e72d47758d50 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h
|
| @@ -51,26 +51,26 @@ class ElementStyleResources {
|
| public:
|
| ElementStyleResources(Document&, float deviceScaleFactor);
|
|
|
| - PassRefPtrWillBeRawPtr<StyleImage> styleImage(CSSPropertyID, const CSSValue&);
|
| - PassRefPtrWillBeRawPtr<StyleImage> cachedOrPendingFromValue(CSSPropertyID, const CSSImageValue&);
|
| - PassRefPtrWillBeRawPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, const CSSImageSetValue&);
|
| + RawPtr<StyleImage> styleImage(CSSPropertyID, const CSSValue&);
|
| + RawPtr<StyleImage> cachedOrPendingFromValue(CSSPropertyID, const CSSImageValue&);
|
| + RawPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, const CSSImageSetValue&);
|
|
|
| void loadPendingResources(ComputedStyle*);
|
|
|
| void addPendingSVGDocument(FilterOperation*, CSSSVGDocumentValue*);
|
|
|
| private:
|
| - PassRefPtrWillBeRawPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, const CSSCursorImageValue&);
|
| - PassRefPtrWillBeRawPtr<StyleImage> generatedOrPendingFromValue(CSSPropertyID, const CSSImageGeneratorValue&);
|
| + RawPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, const CSSCursorImageValue&);
|
| + RawPtr<StyleImage> generatedOrPendingFromValue(CSSPropertyID, const CSSImageGeneratorValue&);
|
|
|
| void loadPendingSVGDocuments(ComputedStyle*);
|
| void loadPendingImages(ComputedStyle*);
|
|
|
| - PassRefPtrWillBeRawPtr<StyleImage> loadPendingImage(StylePendingImage*, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
|
| + RawPtr<StyleImage> loadPendingImage(StylePendingImage*, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
|
|
|
| - RawPtrWillBeMember<Document> m_document;
|
| + Member<Document> m_document;
|
| HashSet<CSSPropertyID> m_pendingImageProperties;
|
| - WillBeHeapHashMap<RawPtrWillBeMember<FilterOperation>, RefPtrWillBeMember<CSSSVGDocumentValue>> m_pendingSVGDocuments;
|
| + HeapHashMap<Member<FilterOperation>, Member<CSSSVGDocumentValue>> m_pendingSVGDocuments;
|
| float m_deviceScaleFactor;
|
| };
|
|
|
|
|