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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/RTCVoidRequestPromiseImpl.cpp

Issue 1729563002: Replace RTCErrorCallback with RTCPeerConnectionErrorCallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/mediastream/RTCVoidRequestPromiseImpl.h" 5 #include "modules/mediastream/RTCVoidRequestPromiseImpl.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "core/dom/DOMException.h" 8 #include "core/dom/DOMException.h"
9 #include "core/dom/ExceptionCode.h"
9 #include "modules/mediastream/RTCPeerConnection.h" 10 #include "modules/mediastream/RTCPeerConnection.h"
10 11
11 namespace blink { 12 namespace blink {
12 13
13 RTCVoidRequestPromiseImpl* RTCVoidRequestPromiseImpl::create(RTCPeerConnection* requester, ScriptPromiseResolver* resolver, ExceptionCode exceptionCode) 14 RTCVoidRequestPromiseImpl* RTCVoidRequestPromiseImpl::create(RTCPeerConnection* requester, ScriptPromiseResolver* resolver)
14 { 15 {
15 return new RTCVoidRequestPromiseImpl(requester, resolver, exceptionCode); 16 return new RTCVoidRequestPromiseImpl(requester, resolver);
16 } 17 }
17 18
18 RTCVoidRequestPromiseImpl::RTCVoidRequestPromiseImpl(RTCPeerConnection* requeste r, ScriptPromiseResolver* resolver, ExceptionCode exceptionCode) 19 RTCVoidRequestPromiseImpl::RTCVoidRequestPromiseImpl(RTCPeerConnection* requeste r, ScriptPromiseResolver* resolver)
19 : m_requester(requester) 20 : m_requester(requester)
20 , m_resolver(resolver) 21 , m_resolver(resolver)
21 , m_exceptionCode(exceptionCode)
22 { 22 {
23 ASSERT(m_requester); 23 ASSERT(m_requester);
24 ASSERT(m_resolver); 24 ASSERT(m_resolver);
25 } 25 }
26 26
27 RTCVoidRequestPromiseImpl::~RTCVoidRequestPromiseImpl() 27 RTCVoidRequestPromiseImpl::~RTCVoidRequestPromiseImpl()
28 { 28 {
29 } 29 }
30 30
31 void RTCVoidRequestPromiseImpl::requestSucceeded() 31 void RTCVoidRequestPromiseImpl::requestSucceeded()
32 { 32 {
33 if (m_requester && m_requester->shouldFireDefaultCallbacks()) { 33 if (m_requester && m_requester->shouldFireDefaultCallbacks()) {
34 m_resolver->resolve(); 34 m_resolver->resolve();
35 } else { 35 } else {
36 // This is needed to have the resolver release its internal resources 36 // This is needed to have the resolver release its internal resources
37 // while leaving the associated promise pending as specified. 37 // while leaving the associated promise pending as specified.
38 m_resolver->detach(); 38 m_resolver->detach();
39 } 39 }
40 40
41 clear(); 41 clear();
42 } 42 }
43 43
44 void RTCVoidRequestPromiseImpl::requestFailed(const String& error) 44 void RTCVoidRequestPromiseImpl::requestFailed(const String& error)
45 { 45 {
46 if (m_requester && m_requester->shouldFireDefaultCallbacks()) { 46 if (m_requester && m_requester->shouldFireDefaultCallbacks()) {
47 m_resolver->reject(DOMException::create(m_exceptionCode, error)); 47 // TODO(guidou): The error code should come from the content layer. See crbug.com/589455
48 m_resolver->reject(DOMException::create(OperationError, error));
48 } else { 49 } else {
49 // This is needed to have the resolver release its internal resources 50 // This is needed to have the resolver release its internal resources
50 // while leaving the associated promise pending as specified. 51 // while leaving the associated promise pending as specified.
51 m_resolver->detach(); 52 m_resolver->detach();
52 } 53 }
53 54
54 clear(); 55 clear();
55 } 56 }
56 57
57 void RTCVoidRequestPromiseImpl::clear() 58 void RTCVoidRequestPromiseImpl::clear()
58 { 59 {
59 m_requester.clear(); 60 m_requester.clear();
60 } 61 }
61 62
62 DEFINE_TRACE(RTCVoidRequestPromiseImpl) 63 DEFINE_TRACE(RTCVoidRequestPromiseImpl)
63 { 64 {
64 visitor->trace(m_resolver); 65 visitor->trace(m_resolver);
65 visitor->trace(m_requester); 66 visitor->trace(m_requester);
66 RTCVoidRequest::trace(visitor); 67 RTCVoidRequest::trace(visitor);
67 } 68 }
68 69
69 } // namespace blink 70 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698