From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../Modules/mediastream/RTCIceCandidateEvent.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp') diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp index 1c28e58e2..ba62fbbe1 100644 --- a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp +++ b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp @@ -24,7 +24,7 @@ #include "config.h" -#if ENABLE(MEDIA_STREAM) +#if ENABLE(WEB_RTC) #include "RTCIceCandidateEvent.h" @@ -33,23 +33,14 @@ namespace WebCore { -PassRefPtr RTCIceCandidateEvent::create() +Ref RTCIceCandidateEvent::create(bool canBubble, bool cancelable, RefPtr&& candidate) { - return adoptRef(new RTCIceCandidateEvent); + return adoptRef(*new RTCIceCandidateEvent(canBubble, cancelable, WTFMove(candidate))); } -PassRefPtr RTCIceCandidateEvent::create(bool canBubble, bool cancelable, PassRefPtr candidate) -{ - return adoptRef(new RTCIceCandidateEvent(canBubble, cancelable, candidate)); -} - -RTCIceCandidateEvent::RTCIceCandidateEvent() -{ -} - -RTCIceCandidateEvent::RTCIceCandidateEvent(bool canBubble, bool cancelable, PassRefPtr candidate) +RTCIceCandidateEvent::RTCIceCandidateEvent(bool canBubble, bool cancelable, RefPtr&& candidate) : Event(eventNames().icecandidateEvent, canBubble, cancelable) - , m_candidate(candidate) + , m_candidate(WTFMove(candidate)) { } @@ -69,5 +60,5 @@ EventInterface RTCIceCandidateEvent::eventInterface() const } // namespace WebCore -#endif // ENABLE(MEDIA_STREAM) +#endif // ENABLE(WEB_RTC) -- cgit v1.2.1