Commit 52a0d092 authored by guidou's avatar guidou Committed by Commit bot

Reflow comments in modules/peerconnection.

This CL has no behavior changes.

BUG=563793

Review-Url: https://codereview.chromium.org/2388193002
Cr-Commit-Position: refs/heads/master@{#422633}
parent a525387e
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCDataChannel.h" #include "modules/peerconnection/RTCDataChannel.h"
...@@ -200,7 +200,8 @@ void RTCDataChannel::send(const String& data, ExceptionState& exceptionState) { ...@@ -200,7 +200,8 @@ void RTCDataChannel::send(const String& data, ExceptionState& exceptionState) {
return; return;
} }
if (!m_handler->sendStringData(data)) { if (!m_handler->sendStringData(data)) {
// FIXME: This should not throw an exception but instead forcefully close the data channel. // FIXME: This should not throw an exception but instead forcefully close
// the data channel.
throwCouldNotSendDataException(exceptionState); throwCouldNotSendDataException(exceptionState);
} }
} }
...@@ -218,7 +219,8 @@ void RTCDataChannel::send(DOMArrayBuffer* data, ...@@ -218,7 +219,8 @@ void RTCDataChannel::send(DOMArrayBuffer* data,
if (!m_handler->sendRawData(static_cast<const char*>((data->data())), if (!m_handler->sendRawData(static_cast<const char*>((data->data())),
dataLength)) { dataLength)) {
// FIXME: This should not throw an exception but instead forcefully close the data channel. // FIXME: This should not throw an exception but instead forcefully close
// the data channel.
throwCouldNotSendDataException(exceptionState); throwCouldNotSendDataException(exceptionState);
} }
} }
...@@ -227,7 +229,8 @@ void RTCDataChannel::send(DOMArrayBufferView* data, ...@@ -227,7 +229,8 @@ void RTCDataChannel::send(DOMArrayBufferView* data,
ExceptionState& exceptionState) { ExceptionState& exceptionState) {
if (!m_handler->sendRawData(static_cast<const char*>(data->baseAddress()), if (!m_handler->sendRawData(static_cast<const char*>(data->baseAddress()),
data->byteLength())) { data->byteLength())) {
// FIXME: This should not throw an exception but instead forcefully close the data channel. // FIXME: This should not throw an exception but instead forcefully close
// the data channel.
throwCouldNotSendDataException(exceptionState); throwCouldNotSendDataException(exceptionState);
} }
} }
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCDataChannel_h #ifndef RTCDataChannel_h
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCDataChannelEvent.h" #include "modules/peerconnection/RTCDataChannelEvent.h"
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCDataChannelEvent_h #ifndef RTCDataChannelEvent_h
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCIceCandidateEvent.h" #include "modules/peerconnection/RTCIceCandidateEvent.h"
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCIceCandidateEvent_h #ifndef RTCIceCandidateEvent_h
......
...@@ -11,16 +11,16 @@ ...@@ -11,16 +11,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCLegacyStatsReport.h" #include "modules/peerconnection/RTCLegacyStatsReport.h"
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCLegacyStatsReport_h #ifndef RTCLegacyStatsReport_h
......
...@@ -378,8 +378,10 @@ RTCOfferOptionsPlatform* parseOfferOptions(const Dictionary& options) { ...@@ -378,8 +378,10 @@ RTCOfferOptionsPlatform* parseOfferOptions(const Dictionary& options) {
Vector<String> propertyNames; Vector<String> propertyNames;
options.getPropertyNames(propertyNames); options.getPropertyNames(propertyNames);
// Treat |options| as MediaConstraints if it is empty or has "optional" or "mandatory" properties for compatibility. // Treat |options| as MediaConstraints if it is empty or has "optional" or
// TODO(jiayl): remove constraints when RTCOfferOptions reaches Stable and client code is ready. // "mandatory" properties for compatibility.
// TODO(jiayl): remove constraints when RTCOfferOptions reaches Stable and
// client code is ready.
if (propertyNames.isEmpty() || propertyNames.contains("optional") || if (propertyNames.isEmpty() || propertyNames.contains("optional") ||
propertyNames.contains("mandatory")) propertyNames.contains("mandatory"))
return 0; return 0;
...@@ -407,7 +409,8 @@ RTCOfferOptionsPlatform* parseOfferOptions(const Dictionary& options) { ...@@ -407,7 +409,8 @@ RTCOfferOptionsPlatform* parseOfferOptions(const Dictionary& options) {
return rtcOfferOptions; return rtcOfferOptions;
} }
// Helper class for |RTCPeerConnection::getStats(ScriptState*, MediaStreamTrack*)| // Helper class for
// |RTCPeerConnection::getStats(ScriptState*, MediaStreamTrack*)|
class WebRTCStatsReportCallbackResolver : public WebRTCStatsReportCallback { class WebRTCStatsReportCallbackResolver : public WebRTCStatsReportCallback {
public: public:
// Takes ownership of |resolver|. // Takes ownership of |resolver|.
...@@ -459,7 +462,8 @@ RTCPeerConnection* RTCPeerConnection::create(ExecutionContext* context, ...@@ -459,7 +462,8 @@ RTCPeerConnection* RTCPeerConnection::create(ExecutionContext* context,
UseCounter::count(context, UseCounter::count(context,
UseCounter::RTCPeerConnectionConstructorCompliant); UseCounter::RTCPeerConnectionConstructorCompliant);
// Record the RtcpMuxPolicy for histogram "WebRTC.PeerConnection.SelectedRtcpMuxPolicy". // Record the RtcpMuxPolicy for histogram
// "WebRTC.PeerConnection.SelectedRtcpMuxPolicy".
RtcpMuxPolicy selectedRtcpMuxPolicy = RtcpMuxPolicyDefault; RtcpMuxPolicy selectedRtcpMuxPolicy = RtcpMuxPolicyDefault;
RTCConfiguration* configuration = parseConfiguration( RTCConfiguration* configuration = parseConfiguration(
rtcConfiguration, exceptionState, &selectedRtcpMuxPolicy); rtcConfiguration, exceptionState, &selectedRtcpMuxPolicy);
...@@ -517,7 +521,8 @@ RTCPeerConnection::RTCPeerConnection(ExecutionContext* context, ...@@ -517,7 +521,8 @@ RTCPeerConnection::RTCPeerConnection(ExecutionContext* context,
ThreadState::current()->registerPreFinalizer(this); ThreadState::current()->registerPreFinalizer(this);
Document* document = toDocument(getExecutionContext()); Document* document = toDocument(getExecutionContext());
// If we fail, set |m_closed| and |m_stopped| to true, to avoid hitting the assert in the destructor. // If we fail, set |m_closed| and |m_stopped| to true, to avoid hitting the
// assert in the destructor.
if (!document->frame()) { if (!document->frame()) {
m_closed = true; m_closed = true;
...@@ -555,7 +560,8 @@ RTCPeerConnection::RTCPeerConnection(ExecutionContext* context, ...@@ -555,7 +560,8 @@ RTCPeerConnection::RTCPeerConnection(ExecutionContext* context,
RTCPeerConnection::~RTCPeerConnection() { RTCPeerConnection::~RTCPeerConnection() {
// This checks that close() or stop() is called before the destructor. // This checks that close() or stop() is called before the destructor.
// We are assuming that a wrapper is always created when RTCPeerConnection is created. // We are assuming that a wrapper is always created when RTCPeerConnection is
// created.
DCHECK(m_closed || m_stopped); DCHECK(m_closed || m_stopped);
} }
...@@ -617,8 +623,9 @@ ScriptPromise RTCPeerConnection::createOffer( ...@@ -617,8 +623,9 @@ ScriptPromise RTCPeerConnection::createOffer(
MediaErrorState mediaErrorState; MediaErrorState mediaErrorState;
WebMediaConstraints constraints = WebMediaConstraints constraints =
MediaConstraintsImpl::create(context, rtcOfferOptions, mediaErrorState); MediaConstraintsImpl::create(context, rtcOfferOptions, mediaErrorState);
// Report constraints parsing errors via the callback, but ignore unknown/unsupported constraints as they // Report constraints parsing errors via the callback, but ignore
// would be silently discarded by WebIDL. // unknown/unsupported constraints as they would be silently discarded by
// WebIDL.
if (mediaErrorState.canGenerateException()) { if (mediaErrorState.canGenerateException()) {
String errorMsg = mediaErrorState.getErrorMessage(); String errorMsg = mediaErrorState.getErrorMessage();
asyncCallErrorCallback(errorCallback, asyncCallErrorCallback(errorCallback,
...@@ -677,8 +684,9 @@ ScriptPromise RTCPeerConnection::createAnswer( ...@@ -677,8 +684,9 @@ ScriptPromise RTCPeerConnection::createAnswer(
MediaErrorState mediaErrorState; MediaErrorState mediaErrorState;
WebMediaConstraints constraints = WebMediaConstraints constraints =
MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState); MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState);
// Report constraints parsing errors via the callback, but ignore unknown/unsupported constraints as they // Report constraints parsing errors via the callback, but ignore
// would be silently discarded by WebIDL. // unknown/unsupported constraints as they would be silently discarded by
// WebIDL.
if (mediaErrorState.canGenerateException()) { if (mediaErrorState.canGenerateException()) {
String errorMsg = mediaErrorState.getErrorMessage(); String errorMsg = mediaErrorState.getErrorMessage();
asyncCallErrorCallback(errorCallback, asyncCallErrorCallback(errorCallback,
...@@ -845,20 +853,22 @@ ScriptPromise RTCPeerConnection::generateCertificate( ...@@ -845,20 +853,22 @@ ScriptPromise RTCPeerConnection::generateCertificate(
ScriptState* scriptState, ScriptState* scriptState,
const AlgorithmIdentifier& keygenAlgorithm, const AlgorithmIdentifier& keygenAlgorithm,
ExceptionState& exceptionState) { ExceptionState& exceptionState) {
// Normalize |keygenAlgorithm| with WebCrypto, making sure it is a recognized AlgorithmIdentifier. // Normalize |keygenAlgorithm| with WebCrypto, making sure it is a recognized
// AlgorithmIdentifier.
WebCryptoAlgorithm cryptoAlgorithm; WebCryptoAlgorithm cryptoAlgorithm;
AlgorithmError error; AlgorithmError error;
if (!normalizeAlgorithm(keygenAlgorithm, WebCryptoOperationGenerateKey, if (!normalizeAlgorithm(keygenAlgorithm, WebCryptoOperationGenerateKey,
cryptoAlgorithm, &error)) { cryptoAlgorithm, &error)) {
// Reject generateCertificate with the same error as was produced by WebCrypto. // Reject generateCertificate with the same error as was produced by
// |result| is garbage collected, no need to delete. // WebCrypto. |result| is garbage collected, no need to delete.
CryptoResultImpl* result = CryptoResultImpl::create(scriptState); CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise(); ScriptPromise promise = result->promise();
result->completeWithError(error.errorType, error.errorDetails); result->completeWithError(error.errorType, error.errorDetails);
return promise; return promise;
} }
// Check if |keygenAlgorithm| contains the optional DOMTimeStamp |expires| attribute. // Check if |keygenAlgorithm| contains the optional DOMTimeStamp |expires|
// attribute.
Nullable<DOMTimeStamp> expires; Nullable<DOMTimeStamp> expires;
if (keygenAlgorithm.isDictionary()) { if (keygenAlgorithm.isDictionary()) {
Dictionary keygenAlgorithmDict = keygenAlgorithm.getAsDictionary(); Dictionary keygenAlgorithmDict = keygenAlgorithm.getAsDictionary();
...@@ -877,7 +887,8 @@ ScriptPromise RTCPeerConnection::generateCertificate( ...@@ -877,7 +887,8 @@ ScriptPromise RTCPeerConnection::generateCertificate(
} }
} }
// Convert from WebCrypto representation to recognized WebRTCKeyParams. WebRTC supports a small subset of what are valid AlgorithmIdentifiers. // Convert from WebCrypto representation to recognized WebRTCKeyParams. WebRTC
// supports a small subset of what are valid AlgorithmIdentifiers.
const char* unsupportedParamsString = const char* unsupportedParamsString =
"The 1st argument provided is an AlgorithmIdentifier with a supported " "The 1st argument provided is an AlgorithmIdentifier with a supported "
"algorithm name, but the parameters are not supported."; "algorithm name, but the parameters are not supported.";
...@@ -886,7 +897,8 @@ ScriptPromise RTCPeerConnection::generateCertificate( ...@@ -886,7 +897,8 @@ ScriptPromise RTCPeerConnection::generateCertificate(
case WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: case WebCryptoAlgorithmIdRsaSsaPkcs1v1_5:
// name: "RSASSA-PKCS1-v1_5" // name: "RSASSA-PKCS1-v1_5"
unsigned publicExponent; unsigned publicExponent;
// "publicExponent" must fit in an unsigned int. The only recognized "hash" is "SHA-256". // "publicExponent" must fit in an unsigned int. The only recognized
// "hash" is "SHA-256".
if (cryptoAlgorithm.rsaHashedKeyGenParams() if (cryptoAlgorithm.rsaHashedKeyGenParams()
->convertPublicExponentToUnsigned(publicExponent) && ->convertPublicExponentToUnsigned(publicExponent) &&
cryptoAlgorithm.rsaHashedKeyGenParams()->hash().id() == cryptoAlgorithm.rsaHashedKeyGenParams()->hash().id() ==
...@@ -926,7 +938,8 @@ ScriptPromise RTCPeerConnection::generateCertificate( ...@@ -926,7 +938,8 @@ ScriptPromise RTCPeerConnection::generateCertificate(
std::unique_ptr<WebRTCCertificateGenerator> certificateGenerator = std::unique_ptr<WebRTCCertificateGenerator> certificateGenerator =
wrapUnique(Platform::current()->createRTCCertificateGenerator()); wrapUnique(Platform::current()->createRTCCertificateGenerator());
// |keyParams| was successfully constructed, but does the certificate generator support these parameters? // |keyParams| was successfully constructed, but does the certificate
// generator support these parameters?
if (!certificateGenerator->isSupportedKeyParams(keyParams.get())) { if (!certificateGenerator->isSupportedKeyParams(keyParams.get())) {
return ScriptPromise::rejectWithDOMException( return ScriptPromise::rejectWithDOMException(
scriptState, scriptState,
...@@ -939,8 +952,9 @@ ScriptPromise RTCPeerConnection::generateCertificate( ...@@ -939,8 +952,9 @@ ScriptPromise RTCPeerConnection::generateCertificate(
std::unique_ptr<WebRTCCertificateObserver> certificateObserver( std::unique_ptr<WebRTCCertificateObserver> certificateObserver(
WebRTCCertificateObserver::create(resolver)); WebRTCCertificateObserver::create(resolver));
// Generate certificate. The |certificateObserver| will resolve the promise asynchronously upon completion. // Generate certificate. The |certificateObserver| will resolve the promise
// The observer will manage its own destruction as well as the resolver's destruction. // asynchronously upon completion. The observer will manage its own
// destruction as well as the resolver's destruction.
if (expires.isNull()) { if (expires.isNull()) {
certificateGenerator->generateCertificate(keyParams.get(), certificateGenerator->generateCertificate(keyParams.get(),
std::move(certificateObserver)); std::move(certificateObserver));
......
...@@ -230,7 +230,8 @@ class RTCPeerConnection final : public EventTargetWithInlineData, ...@@ -230,7 +230,8 @@ class RTCPeerConnection final : public EventTargetWithInlineData,
// Returns true if the state was changed. // Returns true if the state was changed.
bool setIceConnectionState( bool setIceConnectionState(
WebRTCPeerConnectionHandlerClient::ICEConnectionState); WebRTCPeerConnectionHandlerClient::ICEConnectionState);
// Changes the state asynchronously and fires an event immediately after changing the state. // Changes the state asynchronously and fires an event immediately after
// changing the state.
void changeIceConnectionState( void changeIceConnectionState(
WebRTCPeerConnectionHandlerClient::ICEConnectionState); WebRTCPeerConnectionHandlerClient::ICEConnectionState);
......
...@@ -47,7 +47,8 @@ void RTCSessionDescriptionRequestPromiseImpl::requestSucceeded( ...@@ -47,7 +47,8 @@ void RTCSessionDescriptionRequestPromiseImpl::requestSucceeded(
void RTCSessionDescriptionRequestPromiseImpl::requestFailed( void RTCSessionDescriptionRequestPromiseImpl::requestFailed(
const String& error) { const String& error) {
if (m_requester && m_requester->shouldFireDefaultCallbacks()) { if (m_requester && m_requester->shouldFireDefaultCallbacks()) {
// TODO(guidou): The error code should come from the content layer. See crbug.com/589455 // TODO(guidou): The error code should come from the content layer. See
// crbug.com/589455
m_resolver->reject(DOMException::create(OperationError, error)); m_resolver->reject(DOMException::create(OperationError, error));
} else { } else {
// This is needed to have the resolver release its internal resources // This is needed to have the resolver release its internal resources
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCStatsCallback_h #ifndef RTCStatsCallback_h
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCStatsRequestImpl.h" #include "modules/peerconnection/RTCStatsRequestImpl.h"
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCStatsRequestImpl_h #ifndef RTCStatsRequestImpl_h
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "modules/peerconnection/RTCStatsResponse.h" #include "modules/peerconnection/RTCStatsResponse.h"
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RTCStatsResponse_h #ifndef RTCStatsResponse_h
......
...@@ -76,7 +76,8 @@ void RTCVoidRequestImpl::requestFailed(const String& error) { ...@@ -76,7 +76,8 @@ void RTCVoidRequestImpl::requestFailed(const String& error) {
bool shouldFireCallback = bool shouldFireCallback =
m_requester && m_requester->shouldFireDefaultCallbacks(); m_requester && m_requester->shouldFireDefaultCallbacks();
if (shouldFireCallback && m_errorCallback.get()) { if (shouldFireCallback && m_errorCallback.get()) {
// TODO(guidou): The error code should come from the content layer. See crbug.com/589455 // TODO(guidou): The error code should come from the content layer. See
// crbug.com/589455
m_errorCallback->handleEvent(DOMException::create(OperationError, error)); m_errorCallback->handleEvent(DOMException::create(OperationError, error));
} }
......
...@@ -41,7 +41,8 @@ void RTCVoidRequestPromiseImpl::requestSucceeded() { ...@@ -41,7 +41,8 @@ void RTCVoidRequestPromiseImpl::requestSucceeded() {
void RTCVoidRequestPromiseImpl::requestFailed(const String& error) { void RTCVoidRequestPromiseImpl::requestFailed(const String& error) {
if (m_requester && m_requester->shouldFireDefaultCallbacks()) { if (m_requester && m_requester->shouldFireDefaultCallbacks()) {
// TODO(guidou): The error code should come from the content layer. See crbug.com/589455 // TODO(guidou): The error code should come from the content layer. See
// crbug.com/589455
m_resolver->reject(DOMException::create(OperationError, error)); m_resolver->reject(DOMException::create(OperationError, error));
} else { } else {
// This is needed to have the resolver release its internal resources // This is needed to have the resolver release its internal resources
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment