Changeset 159769 in webkit
- Timestamp:
- Nov 25, 2013 3:21:47 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r159767 r159769 1 2013-11-25 Sergio Correia <sergio.correia@openbossa.org> 2 3 [MediaStream] Use std::unique_ptr instead of OwnPtr/PassOwnPtr 4 https://bugs.webkit.org/show_bug.cgi?id=124858 5 6 Reviewed by Eric Carlson. 7 8 Another step of the OwnPtr/PassOwnPtr => std::unique_ptr conversion, 9 now targeting mediastream-related code. 10 11 No new tests, covered by existing ones. 12 13 * Modules/mediastream/RTCDTMFSender.cpp: 14 * Modules/mediastream/RTCDTMFSender.h: 15 * Modules/mediastream/RTCDataChannel.cpp: 16 * Modules/mediastream/RTCDataChannel.h: 17 * Modules/mediastream/RTCPeerConnection.cpp: 18 * Modules/mediastream/RTCPeerConnection.h: 19 * platform/mediastream/MediaStreamSource.cpp: 20 * platform/mediastream/RTCPeerConnectionHandler.cpp: 21 * platform/mediastream/RTCPeerConnectionHandler.h: 22 * platform/mediastream/RTCPeerConnectionHandlerClient.h: 23 * platform/mock/RTCNotifiersMock.cpp: 24 * platform/mock/RTCPeerConnectionHandlerMock.cpp: 25 * platform/mock/RTCPeerConnectionHandlerMock.h: 26 1 27 2013-11-25 Nick Diego Yamane <nick.yamane@openbossa.org> 2 28 -
trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp
r159447 r159769 48 48 { 49 49 RefPtr<MediaStreamTrack> track = prpTrack; 50 OwnPtr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());50 std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source()); 51 51 if (!handler) { 52 52 ec = NOT_SUPPORTED_ERR; … … 54 54 } 55 55 56 RefPtr<RTCDTMFSender> dtmfSender = adoptRef(new RTCDTMFSender(context, track, handler.release()));56 RefPtr<RTCDTMFSender> dtmfSender = adoptRef(new RTCDTMFSender(context, track, std::move(handler))); 57 57 dtmfSender->suspendIfNeeded(); 58 58 return dtmfSender.release(); 59 59 } 60 60 61 RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrack> track, PassOwnPtr<RTCDTMFSenderHandler> handler)61 RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrack> track, std::unique_ptr<RTCDTMFSenderHandler> handler) 62 62 : ActiveDOMObject(context) 63 63 , m_track(track) 64 64 , m_duration(defaultToneDurationMs) 65 65 , m_interToneGap(defaultInterToneGapMs) 66 , m_handler( handler)66 , m_handler(std::move(handler)) 67 67 , m_stopped(false) 68 68 , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired) -
trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h
r157653 r159769 70 70 71 71 private: 72 RTCDTMFSender(ScriptExecutionContext*, PassRefPtr<MediaStreamTrack>, PassOwnPtr<RTCDTMFSenderHandler>);72 RTCDTMFSender(ScriptExecutionContext*, PassRefPtr<MediaStreamTrack>, std::unique_ptr<RTCDTMFSenderHandler>); 73 73 74 74 void scheduleDispatchEvent(PassRefPtr<Event>); … … 86 86 long m_interToneGap; 87 87 88 OwnPtr<RTCDTMFSenderHandler> m_handler;88 std::unique_ptr<RTCDTMFSenderHandler> m_handler; 89 89 90 90 bool m_stopped; -
trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
r159447 r159769 65 65 options.get("protocol", initData.protocol); 66 66 67 OwnPtr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData);67 std::unique_ptr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, initData); 68 68 if (!handler) { 69 69 ec = NOT_SUPPORTED_ERR; 70 70 return nullptr; 71 71 } 72 return adoptRef(new RTCDataChannel(context, handler.release()));73 } 74 75 PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)72 return adoptRef(new RTCDataChannel(context, std::move(handler))); 73 } 74 75 PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler) 76 76 { 77 77 ASSERT(handler); 78 return adoptRef(new RTCDataChannel(context, handler));79 } 80 81 RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)78 return adoptRef(new RTCDataChannel(context, std::move(handler))); 79 } 80 81 RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, std::unique_ptr<RTCDataChannelHandler> handler) 82 82 : m_scriptExecutionContext(context) 83 , m_handler( handler)83 , m_handler(std::move(handler)) 84 84 , m_stopped(false) 85 85 , m_readyState(ReadyStateConnecting) -
trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h
r157653 r159769 48 48 class RTCDataChannel FINAL : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient { 49 49 public: 50 static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);50 static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>); 51 51 static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, const String& , const Dictionary&, ExceptionCode&); 52 52 ~RTCDataChannel(); … … 87 87 88 88 private: 89 RTCDataChannel(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);89 RTCDataChannel(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>); 90 90 91 91 void scheduleDispatchEvent(PassRefPtr<Event>); … … 104 104 virtual void didDetectError() OVERRIDE; 105 105 106 OwnPtr<RTCDataChannelHandler> m_handler;106 std::unique_ptr<RTCDataChannelHandler> m_handler; 107 107 108 108 bool m_stopped; -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
r159447 r159769 575 575 } 576 576 577 void RTCPeerConnection::didAddRemoteDataChannel( PassOwnPtr<RTCDataChannelHandler> handler)577 void RTCPeerConnection::didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler> handler) 578 578 { 579 579 ASSERT(scriptExecutionContext()->isContextThread()); … … 582 582 return; 583 583 584 RefPtr<RTCDataChannel> channel = RTCDataChannel::create(scriptExecutionContext(), handler);584 RefPtr<RTCDataChannel> channel = RTCDataChannel::create(scriptExecutionContext(), std::move(handler)); 585 585 m_dataChannels.append(channel); 586 586 -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r158849 r159769 119 119 virtual void didAddRemoteStream(PassRefPtr<MediaStreamPrivate>) OVERRIDE; 120 120 virtual void didRemoveRemoteStream(MediaStreamPrivate*) OVERRIDE; 121 virtual void didAddRemoteDataChannel( PassOwnPtr<RTCDataChannelHandler>) OVERRIDE;121 virtual void didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler>) OVERRIDE; 122 122 123 123 // EventTarget … … 156 156 Vector<RefPtr<RTCDataChannel>> m_dataChannels; 157 157 158 OwnPtr<RTCPeerConnectionHandler> m_peerHandler;158 std::unique_ptr<RTCPeerConnectionHandler> m_peerHandler; 159 159 160 160 Timer<RTCPeerConnection> m_scheduledEventTimer; -
trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp
r158849 r159769 40 40 #include "MediaStreamSourceCapabilities.h" 41 41 #include "UUID.h" 42 43 #include <wtf/PassOwnPtr.h>44 42 45 43 namespace WebCore { -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
r157808 r159769 35 35 #include "RTCPeerConnectionHandler.h" 36 36 37 #include <wtf/PassOwnPtr.h>38 39 37 namespace WebCore { 40 38 class RTCPeerConnectionHandlerClient; 41 39 42 static PassOwnPtr<RTCPeerConnectionHandler> createHandler(RTCPeerConnectionHandlerClient*)40 static std::unique_ptr<RTCPeerConnectionHandler> createHandler(RTCPeerConnectionHandlerClient*) 43 41 { 44 42 return nullptr; -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
r158849 r159769 35 35 36 36 #include "MediaStreamPrivate.h" 37 #include <wtf/PassOwnPtr.h>38 37 #include <wtf/PassRefPtr.h> 39 38 … … 69 68 }; 70 69 71 typedef PassOwnPtr<RTCPeerConnectionHandler> (*CreatePeerConnectionHandler)(RTCPeerConnectionHandlerClient*);70 typedef std::unique_ptr<RTCPeerConnectionHandler> (*CreatePeerConnectionHandler)(RTCPeerConnectionHandlerClient*); 72 71 73 72 class RTCPeerConnectionHandler { … … 89 88 virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0; 90 89 virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0; 91 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;92 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0;90 virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0; 91 virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0; 93 92 virtual void stop() = 0; 94 95 protected:96 RTCPeerConnectionHandler() { }97 93 }; 98 94 -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h
r158849 r159769 34 34 #if ENABLE(MEDIA_STREAM) 35 35 36 #include <wtf/PassOwnPtr.h>37 36 #include <wtf/PassRefPtr.h> 38 37 … … 79 78 virtual void didAddRemoteStream(PassRefPtr<MediaStreamPrivate>) = 0; 80 79 virtual void didRemoveRemoteStream(MediaStreamPrivate*) = 0; 81 virtual void didAddRemoteDataChannel( PassOwnPtr<RTCDataChannelHandler>) = 0;80 virtual void didAddRemoteDataChannel(std::unique_ptr<RTCDataChannelHandler>) = 0; 82 81 }; 83 82 -
trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp
r157892 r159769 85 85 void RemoteDataChannelNotifier::fire() 86 86 { 87 m_client->didAddRemoteDataChannel( adoptPtr(new RTCDataChannelHandlerMock("RTCDataChannelHandlerMock", RTCDataChannelInit())));87 m_client->didAddRemoteDataChannel(std::make_unique<RTCDataChannelHandlerMock>("RTCDataChannelHandlerMock", RTCDataChannelInit())); 88 88 } 89 89 -
trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp
r158849 r159769 40 40 41 41 namespace WebCore { 42 43 PassOwnPtr<RTCPeerConnectionHandler> RTCPeerConnectionHandlerMock::create(RTCPeerConnectionHandlerClient* client)44 {45 return adoptPtr(new RTCPeerConnectionHandlerMock(client));46 }47 42 48 43 RTCPeerConnectionHandlerMock::RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient* client) … … 154 149 } 155 150 156 PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandlerMock::createDataChannel(const String& label, const RTCDataChannelInit& init)151 std::unique_ptr<RTCDataChannelHandler> RTCPeerConnectionHandlerMock::createDataChannel(const String& label, const RTCDataChannelInit& init) 157 152 { 158 153 RefPtr<RemoteDataChannelNotifier> notifier = adoptRef(new RemoteDataChannelNotifier(m_client)); 159 154 m_timerEvents.append(adoptRef(new TimerEvent(this, notifier))); 160 return adoptPtr(new RTCDataChannelHandlerMock(label, init));155 return std::make_unique<RTCDataChannelHandlerMock>(label, init); 161 156 } 162 157 163 PassOwnPtr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>)158 std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>) 164 159 { 165 160 // Requires a mock implementation of RTCDTMFSenderHandler. 166 161 // This must be implemented once the mock implementation of RTCDataChannelHandler is ready. 167 162 notImplemented(); 168 return 0;163 return nullptr; 169 164 } 170 165 -
trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h
r158849 r159769 37 37 class RTCPeerConnectionHandlerMock FINAL : public RTCPeerConnectionHandler, public TimerEventBasedMock { 38 38 public: 39 static PassOwnPtr<RTCPeerConnectionHandler> create(RTCPeerConnectionHandlerClient*);40 39 virtual ~RTCPeerConnectionHandlerMock() { } 41 40 … … 53 52 virtual void removeStream(PassRefPtr<MediaStreamPrivate>) OVERRIDE; 54 53 virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE; 55 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) OVERRIDE;56 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) OVERRIDE;54 virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) OVERRIDE; 55 virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) OVERRIDE; 57 56 virtual void stop() OVERRIDE; 58 57 59 58 protected: 60 RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*);59 explicit RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*); 61 60 62 61 private:
Note: See TracChangeset
for help on using the changeset viewer.