| Index: third_party/WebKit/Source/core/css/MediaQueryList.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/MediaQueryList.cpp b/third_party/WebKit/Source/core/css/MediaQueryList.cpp
|
| index 525a5a6fa2ef56b69d939ff4b01816ad8f5c7fe4..6c778b159cdd9c794c05048eceef092b7c4b8119 100644
|
| --- a/third_party/WebKit/Source/core/css/MediaQueryList.cpp
|
| +++ b/third_party/WebKit/Source/core/css/MediaQueryList.cpp
|
| @@ -27,14 +27,14 @@
|
|
|
| namespace blink {
|
|
|
| -PassRefPtrWillBeRawPtr<MediaQueryList> MediaQueryList::create(ExecutionContext* context, PassRefPtrWillBeRawPtr<MediaQueryMatcher> matcher, PassRefPtrWillBeRawPtr<MediaQuerySet> media)
|
| +RawPtr<MediaQueryList> MediaQueryList::create(ExecutionContext* context, RawPtr<MediaQueryMatcher> matcher, RawPtr<MediaQuerySet> media)
|
| {
|
| - RefPtrWillBeRawPtr<MediaQueryList> list = adoptRefWillBeNoop(new MediaQueryList(context, matcher, media));
|
| + RawPtr<MediaQueryList> list = (new MediaQueryList(context, matcher, media));
|
| list->suspendIfNeeded();
|
| return list.release();
|
| }
|
|
|
| -MediaQueryList::MediaQueryList(ExecutionContext* context, PassRefPtrWillBeRawPtr<MediaQueryMatcher> matcher, PassRefPtrWillBeRawPtr<MediaQuerySet> media)
|
| +MediaQueryList::MediaQueryList(ExecutionContext* context, RawPtr<MediaQueryMatcher> matcher, RawPtr<MediaQuerySet> media)
|
| : ActiveDOMObject(context)
|
| , m_matcher(matcher)
|
| , m_media(media)
|
| @@ -57,7 +57,7 @@ String MediaQueryList::media() const
|
| return m_media->mediaText();
|
| }
|
|
|
| -void MediaQueryList::addDeprecatedListener(PassRefPtrWillBeRawPtr<EventListener> listener)
|
| +void MediaQueryList::addDeprecatedListener(RawPtr<EventListener> listener)
|
| {
|
| if (!listener)
|
| return;
|
| @@ -65,7 +65,7 @@ void MediaQueryList::addDeprecatedListener(PassRefPtrWillBeRawPtr<EventListener>
|
| addEventListener(EventTypeNames::change, listener, false);
|
| }
|
|
|
| -void MediaQueryList::removeDeprecatedListener(PassRefPtrWillBeRawPtr<EventListener> listener)
|
| +void MediaQueryList::removeDeprecatedListener(RawPtr<EventListener> listener)
|
| {
|
| if (!listener)
|
| return;
|
| @@ -73,7 +73,7 @@ void MediaQueryList::removeDeprecatedListener(PassRefPtrWillBeRawPtr<EventListen
|
| removeEventListener(EventTypeNames::change, listener, false);
|
| }
|
|
|
| -void MediaQueryList::addListener(PassRefPtrWillBeRawPtr<MediaQueryListListener> listener)
|
| +void MediaQueryList::addListener(RawPtr<MediaQueryListListener> listener)
|
| {
|
| if (!listener)
|
| return;
|
| @@ -81,12 +81,12 @@ void MediaQueryList::addListener(PassRefPtrWillBeRawPtr<MediaQueryListListener>
|
| m_listeners.add(listener);
|
| }
|
|
|
| -void MediaQueryList::removeListener(PassRefPtrWillBeRawPtr<MediaQueryListListener> listener)
|
| +void MediaQueryList::removeListener(RawPtr<MediaQueryListListener> listener)
|
| {
|
| if (!listener)
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<MediaQueryList> protect(this);
|
| + RawPtr<MediaQueryList> protect(this);
|
| m_listeners.remove(listener);
|
| }
|
|
|
| @@ -98,12 +98,12 @@ bool MediaQueryList::hasPendingActivity() const
|
| void MediaQueryList::stop()
|
| {
|
| // m_listeners.clear() can drop the last ref to this MediaQueryList.
|
| - RefPtrWillBeRawPtr<MediaQueryList> protect(this);
|
| + RawPtr<MediaQueryList> protect(this);
|
| m_listeners.clear();
|
| removeAllEventListeners();
|
| }
|
|
|
| -bool MediaQueryList::mediaFeaturesChanged(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener>>* listenersToNotify)
|
| +bool MediaQueryList::mediaFeaturesChanged(HeapVector<Member<MediaQueryListListener>>* listenersToNotify)
|
| {
|
| m_matchesDirty = true;
|
| if (!updateMatches())
|
|
|