| Index: third_party/WebKit/Source/core/css/MediaQueryMatcher.h
|
| diff --git a/third_party/WebKit/Source/core/css/MediaQueryMatcher.h b/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
|
| index e3cdb2c767c964aa28a305e2b13df8f434f8aee9..76412beca64410475f0eefa7f3dba1ecd18ebdbc 100644
|
| --- a/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
|
| +++ b/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
|
| @@ -38,10 +38,10 @@ class MediaQuerySet;
|
| // whenever it is needed and to call the listeners if the corresponding query has changed.
|
| // The listeners must be called in the very same order in which they have been added.
|
|
|
| -class CORE_EXPORT MediaQueryMatcher final : public RefCountedWillBeGarbageCollectedFinalized<MediaQueryMatcher> {
|
| +class CORE_EXPORT MediaQueryMatcher final : public GarbageCollectedFinalized<MediaQueryMatcher> {
|
| WTF_MAKE_NONCOPYABLE(MediaQueryMatcher);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<MediaQueryMatcher> create(Document&);
|
| + static RawPtr<MediaQueryMatcher> create(Document&);
|
| ~MediaQueryMatcher();
|
|
|
| void documentDetached();
|
| @@ -49,10 +49,10 @@ public:
|
| void addMediaQueryList(MediaQueryList*);
|
| void removeMediaQueryList(MediaQueryList*);
|
|
|
| - void addViewportListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
|
| - void removeViewportListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>);
|
| + void addViewportListener(RawPtr<MediaQueryListListener>);
|
| + void removeViewportListener(RawPtr<MediaQueryListListener>);
|
|
|
| - PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&);
|
| + RawPtr<MediaQueryList> matchMedia(const String&);
|
|
|
| void mediaFeaturesChanged();
|
| void viewportChanged();
|
| @@ -63,15 +63,15 @@ public:
|
| private:
|
| explicit MediaQueryMatcher(Document&);
|
|
|
| - PassOwnPtrWillBeRawPtr<MediaQueryEvaluator> createEvaluator() const;
|
| + RawPtr<MediaQueryEvaluator> createEvaluator() const;
|
|
|
| - RawPtrWillBeMember<Document> m_document;
|
| - OwnPtrWillBeMember<MediaQueryEvaluator> m_evaluator;
|
| + Member<Document> m_document;
|
| + Member<MediaQueryEvaluator> m_evaluator;
|
|
|
| - using MediaQueryListSet = WillBeHeapLinkedHashSet<RawPtrWillBeWeakMember<MediaQueryList>>;
|
| + using MediaQueryListSet = HeapLinkedHashSet<WeakMember<MediaQueryList>>;
|
| MediaQueryListSet m_mediaLists;
|
|
|
| - using ViewportListenerSet = WillBeHeapLinkedHashSet<RefPtrWillBeMember<MediaQueryListListener>>;
|
| + using ViewportListenerSet = HeapLinkedHashSet<Member<MediaQueryListListener>>;
|
| ViewportListenerSet m_viewportListeners;
|
| };
|
|
|
|
|