Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h
index 6091d2b8896e0ed93d9ee4292a0257d5fbb846fc..ed92c02106e2c1e458ac6a3459585c7397f7ed91 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h
+++ b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h
@@ -34,7 +34,6 @@
#include "public/platform/WebRTCDataChannelHandler.h"
#include "public/platform/WebRTCDataChannelHandlerClient.h"
#include "wtf/Compiler.h"
-#include <memory>
namespace blink {
@@ -56,7 +55,7 @@ class MODULES_EXPORT RTCDataChannel final
DEFINE_WRAPPERTYPEINFO();
USING_PRE_FINALIZER(RTCDataChannel, dispose);
public:
- static RTCDataChannel* create(ExecutionContext*, std::unique_ptr<WebRTCDataChannelHandler>);
+ static RTCDataChannel* create(ExecutionContext*, PassOwnPtr<WebRTCDataChannelHandler>);
static RTCDataChannel* create(ExecutionContext*, WebRTCPeerConnectionHandler*, const String& label, const WebRTCDataChannelInit&, ExceptionState&);
~RTCDataChannel() override;
@@ -117,13 +116,13 @@ public:
void didDetectError() override;
private:
- RTCDataChannel(ExecutionContext*, std::unique_ptr<WebRTCDataChannelHandler>);
+ RTCDataChannel(ExecutionContext*, PassOwnPtr<WebRTCDataChannelHandler>);
void dispose();
void scheduleDispatchEvent(Event*);
void scheduledEventTimerFired(Timer<RTCDataChannel>*);
- std::unique_ptr<WebRTCDataChannelHandler> m_handler;
+ OwnPtr<WebRTCDataChannelHandler> m_handler;
WebRTCDataChannelHandlerClient::ReadyState m_readyState;

Powered by Google App Engine
This is Rietveld 408576698