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

Side by Side Diff: Source/modules/mediastream/RTCDataChannel.cpp

Issue 614373007: Oilpan: Remove adoptRefCountedGarbageCollected (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 static void throwNoBlobSupportException(ExceptionState& exceptionState) 50 static void throwNoBlobSupportException(ExceptionState& exceptionState)
51 { 51 {
52 exceptionState.throwDOMException(NotSupportedError, "Blob support not implem ented yet"); 52 exceptionState.throwDOMException(NotSupportedError, "Blob support not implem ented yet");
53 } 53 }
54 54
55 RTCDataChannel* RTCDataChannel::create(ExecutionContext* context, RTCPeerConnect ion* connection, PassOwnPtr<WebRTCDataChannelHandler> handler) 55 RTCDataChannel* RTCDataChannel::create(ExecutionContext* context, RTCPeerConnect ion* connection, PassOwnPtr<WebRTCDataChannelHandler> handler)
56 { 56 {
57 ASSERT(handler); 57 ASSERT(handler);
58 return adoptRefCountedGarbageCollectedWillBeNoop(new RTCDataChannel(context, connection, handler)); 58 return new RTCDataChannel(context, connection, handler);
59 } 59 }
60 60
61 RTCDataChannel* RTCDataChannel::create(ExecutionContext* context, RTCPeerConnect ion* connection, WebRTCPeerConnectionHandler* peerConnectionHandler, const Strin g& label, const WebRTCDataChannelInit& init, ExceptionState& exceptionState) 61 RTCDataChannel* RTCDataChannel::create(ExecutionContext* context, RTCPeerConnect ion* connection, WebRTCPeerConnectionHandler* peerConnectionHandler, const Strin g& label, const WebRTCDataChannelInit& init, ExceptionState& exceptionState)
62 { 62 {
63 OwnPtr<WebRTCDataChannelHandler> handler = adoptPtr(peerConnectionHandler->c reateDataChannel(label, init)); 63 OwnPtr<WebRTCDataChannelHandler> handler = adoptPtr(peerConnectionHandler->c reateDataChannel(label, init));
64 if (!handler) { 64 if (!handler) {
65 exceptionState.throwDOMException(NotSupportedError, "RTCDataChannel is n ot supported"); 65 exceptionState.throwDOMException(NotSupportedError, "RTCDataChannel is n ot supported");
66 return nullptr; 66 return nullptr;
67 } 67 }
68 return adoptRefCountedGarbageCollectedWillBeNoop(new RTCDataChannel(context, connection, handler.release())); 68 return new RTCDataChannel(context, connection, handler.release());
69 } 69 }
70 70
71 RTCDataChannel::RTCDataChannel(ExecutionContext* context, RTCPeerConnection* con nection, PassOwnPtr<WebRTCDataChannelHandler> handler) 71 RTCDataChannel::RTCDataChannel(ExecutionContext* context, RTCPeerConnection* con nection, PassOwnPtr<WebRTCDataChannelHandler> handler)
72 : m_executionContext(context) 72 : m_executionContext(context)
73 , m_handler(handler) 73 , m_handler(handler)
74 , m_stopped(false) 74 , m_stopped(false)
75 , m_readyState(ReadyStateConnecting) 75 , m_readyState(ReadyStateConnecting)
76 , m_binaryType(BinaryTypeArrayBuffer) 76 , m_binaryType(BinaryTypeArrayBuffer)
77 , m_scheduledEventTimer(this, &RTCDataChannel::scheduledEventTimerFired) 77 , m_scheduledEventTimer(this, &RTCDataChannel::scheduledEventTimerFired)
78 , m_connection(connection) 78 , m_connection(connection)
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 328 }
329 329
330 void RTCDataChannel::trace(Visitor* visitor) 330 void RTCDataChannel::trace(Visitor* visitor)
331 { 331 {
332 visitor->trace(m_scheduledEvents); 332 visitor->trace(m_scheduledEvents);
333 visitor->registerWeakMembers<RTCDataChannel, &RTCDataChannel::clearWeakMembe rs>(this); 333 visitor->registerWeakMembers<RTCDataChannel, &RTCDataChannel::clearWeakMembe rs>(this);
334 EventTargetWithInlineData::trace(visitor); 334 EventTargetWithInlineData::trace(visitor);
335 } 335 }
336 336
337 } // namespace blink 337 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediastream/RTCDTMFSender.cpp ('k') | Source/modules/mediastream/RTCPeerConnection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698