| Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h
|
| index b641e08ed4ce7fb3077badc0c6a64c88fc948390..25dceb235dfaa6111dadb89afcd2e12d8bf1b4b7 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h
|
| +++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h
|
| @@ -62,7 +62,7 @@ class RTCPeerConnection final
|
| , public ActiveDOMObject {
|
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCPeerConnection);
|
| DEFINE_WRAPPERTYPEINFO();
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
|
| + USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
|
| public:
|
| // TODO(hbos): Create with expired RTCCertificate should fail, see crbug.com/565278.
|
| static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&);
|
| @@ -159,14 +159,14 @@ private:
|
| typedef Function<bool()> BoolFunction;
|
| class EventWrapper : public GarbageCollectedFinalized<EventWrapper> {
|
| public:
|
| - EventWrapper(PassRefPtrWillBeRawPtr<Event>, PassOwnPtr<BoolFunction>);
|
| + EventWrapper(RawPtr<Event>, PassOwnPtr<BoolFunction>);
|
| // Returns true if |m_setupFunction| returns true or it is null.
|
| // |m_event| will only be fired if setup() returns true;
|
| bool setup();
|
|
|
| DECLARE_TRACE();
|
|
|
| - RefPtrWillBeMember<Event> m_event;
|
| + Member<Event> m_event;
|
|
|
| private:
|
| OwnPtr<BoolFunction> m_setupFunction;
|
| @@ -177,8 +177,8 @@ private:
|
| static RTCConfiguration* parseConfiguration(const Dictionary&, ExceptionState&);
|
| static RTCOfferOptions* parseOfferOptions(const Dictionary&, ExceptionState&);
|
|
|
| - void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
|
| - void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>, PassOwnPtr<BoolFunction>);
|
| + void scheduleDispatchEvent(RawPtr<Event>);
|
| + void scheduleDispatchEvent(RawPtr<Event>, PassOwnPtr<BoolFunction>);
|
| void dispatchScheduledEvent();
|
| bool hasLocalStreamWithTrackId(const String& trackId);
|
|
|
|
|