third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp - Issue 1729563002: Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.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

« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h ('k') | third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp

diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp

index c4676c65d394dbc207eda1becb54a9499dd59043..29463de6a741e13ee8fcbc97c5d7ade900f81e5f 100644

--- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp

+++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp

@@ -30,8 +30,10 @@

#include "modules/mediastream/RTCSessionDescriptionRequestImpl.h"

-#include "modules/mediastream/RTCErrorCallback.h"

+#include "core/dom/DOMException.h"

+#include "core/dom/ExceptionCode.h"

#include "modules/mediastream/RTCPeerConnection.h"

+#include "modules/mediastream/RTCPeerConnectionErrorCallback.h"

#include "modules/mediastream/RTCSessionDescription.h"

#include "modules/mediastream/RTCSessionDescriptionCallback.h"

#include "public/platform/WebRTCSessionDescription.h"

@@ -39,14 +41,14 @@

namespace blink {

-RTCSessionDescriptionRequestImpl* RTCSessionDescriptionRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback)

+RTCSessionDescriptionRequestImpl* RTCSessionDescriptionRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)

{

RTCSessionDescriptionRequestImpl* request = new RTCSessionDescriptionRequestImpl(context, requester, successCallback, errorCallback);

request->suspendIfNeeded();

return request;

}

-RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback)

+RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)

: ActiveDOMObject(context)

, m_successCallback(successCallback)

, m_errorCallback(errorCallback)

@@ -71,7 +73,7 @@ void RTCSessionDescriptionRequestImpl::requestFailed(const String& error)

{

bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;

if (shouldFireCallback && m_errorCallback)

- m_errorCallback->handleEvent(error);

+ m_errorCallback->handleEvent(DOMException::create(OperationError, error));

clear();

}