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

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

Issue 1010393002: Fix issue of localDescription and remoteDescription getter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix test case crash. Created 5 years, 7 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 /* 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/mediastream/RTCVoidRequestImpl.h" 32 #include "modules/mediastream/RTCVoidRequestImpl.h"
33 33
34 #include "core/html/VoidCallback.h" 34 #include "core/html/VoidCallback.h"
35 #include "modules/mediastream/RTCErrorCallback.h" 35 #include "modules/mediastream/RTCErrorCallback.h"
36 #include "modules/mediastream/RTCPeerConnection.h" 36 #include "modules/mediastream/RTCPeerConnection.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 RTCVoidRequestImpl* RTCVoidRequestImpl::create(ExecutionContext* context, RTCPee rConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCa llback) 40 RTCVoidRequestImpl* RTCVoidRequestImpl::create(ExecutionContext* context, RTCPee rConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCa llback, RequestType type)
41 { 41 {
42 RTCVoidRequestImpl* request = new RTCVoidRequestImpl(context, requester, suc cessCallback, errorCallback); 42 RTCVoidRequestImpl* request = new RTCVoidRequestImpl(context, requester, suc cessCallback, errorCallback, type);
43 request->suspendIfNeeded(); 43 request->suspendIfNeeded();
44 return request; 44 return request;
45 } 45 }
46 46
47 RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnect ion* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback) 47 RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnect ion* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback, RequestType type)
48 : ActiveDOMObject(context) 48 : ActiveDOMObject(context)
49 , m_successCallback(successCallback) 49 , m_successCallback(successCallback)
50 , m_errorCallback(errorCallback) 50 , m_errorCallback(errorCallback)
51 , m_requester(requester) 51 , m_requester(requester)
52 , m_requestType(type)
52 { 53 {
53 ASSERT(m_requester); 54 ASSERT(m_requester);
54 } 55 }
55 56
56 RTCVoidRequestImpl::~RTCVoidRequestImpl() 57 RTCVoidRequestImpl::~RTCVoidRequestImpl()
57 { 58 {
58 } 59 }
59 60
60 void RTCVoidRequestImpl::requestSucceeded() 61 void RTCVoidRequestImpl::requestSucceeded()
61 { 62 {
62 bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallba cks() : false; 63 bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallba cks() : false;
64 m_requester->requestSucceeded(m_requestType);
65
63 if (shouldFireCallback && m_successCallback) 66 if (shouldFireCallback && m_successCallback)
64 m_successCallback->handleEvent(); 67 m_successCallback->handleEvent();
65 68
66 clear(); 69 clear();
67 } 70 }
68 71
69 void RTCVoidRequestImpl::requestFailed(const String& error) 72 void RTCVoidRequestImpl::requestFailed(const String& error)
70 { 73 {
71 bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallba cks() : false; 74 bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallba cks() : false;
72 if (shouldFireCallback && m_errorCallback.get()) 75 if (shouldFireCallback && m_errorCallback.get())
(...skipping 17 matching lines...) Expand all
90 DEFINE_TRACE(RTCVoidRequestImpl) 93 DEFINE_TRACE(RTCVoidRequestImpl)
91 { 94 {
92 visitor->trace(m_successCallback); 95 visitor->trace(m_successCallback);
93 visitor->trace(m_errorCallback); 96 visitor->trace(m_errorCallback);
94 visitor->trace(m_requester); 97 visitor->trace(m_requester);
95 RTCVoidRequest::trace(visitor); 98 RTCVoidRequest::trace(visitor);
96 ActiveDOMObject::trace(visitor); 99 ActiveDOMObject::trace(visitor);
97 } 100 }
98 101
99 } // namespace blink 102 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediastream/RTCVoidRequestImpl.h ('k') | public/platform/WebRTCSessionDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698