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

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp b/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
index 9117a58a55d0dd04ffae875fc02090dcaa5fa22b..7222aa2b24d1b48d9273cc207a68fc60461f235e 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
@@ -30,20 +30,22 @@
#include "modules/mediastream/RTCVoidRequestImpl.h"
+#include "core/dom/DOMException.h"
+#include "core/dom/ExceptionCode.h"
#include "core/html/VoidCallback.h"
-#include "modules/mediastream/RTCErrorCallback.h"
#include "modules/mediastream/RTCPeerConnection.h"
+#include "modules/mediastream/RTCPeerConnectionErrorCallback.h"
namespace blink {
-RTCVoidRequestImpl* RTCVoidRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback)
+RTCVoidRequestImpl* RTCVoidRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)
{
RTCVoidRequestImpl* request = new RTCVoidRequestImpl(context, requester, successCallback, errorCallback);
request->suspendIfNeeded();
return request;
}
-RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback)
+RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)
: ActiveDOMObject(context)
, m_successCallback(successCallback)
, m_errorCallback(errorCallback)
@@ -58,7 +60,7 @@ RTCVoidRequestImpl::~RTCVoidRequestImpl()
void RTCVoidRequestImpl::requestSucceeded()
{
- bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;
+ bool shouldFireCallback = m_requester && m_requester->shouldFireDefaultCallbacks();
if (shouldFireCallback && m_successCallback)
m_successCallback->handleEvent();
@@ -67,9 +69,11 @@ void RTCVoidRequestImpl::requestSucceeded()
void RTCVoidRequestImpl::requestFailed(const String& error)
{
- bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;
- if (shouldFireCallback && m_errorCallback.get())
- m_errorCallback->handleEvent(error);
+ bool shouldFireCallback = m_requester && m_requester->shouldFireDefaultCallbacks();
+ if (shouldFireCallback && m_errorCallback.get()) {
+ // TODO(guidou): The error code should come from the content layer. See crbug.com/589455
+ m_errorCallback->handleEvent(DOMException::create(OperationError, error));
+ }
clear();
}

Powered by Google App Engine
This is Rietveld 408576698