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

Unified Diff: third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp

Issue 2415673003: Merge RTCConfiguration into WebRTCConfiguration (Closed)
Patch Set: headers, kConstants Created 4 years, 2 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/platform/exported/WebRTCConfiguration.cpp
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
deleted file mode 100644
index 3f87012b0728712d2a7afd46aef2c5bbe84e99ff..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "public/platform/WebRTCConfiguration.h"
-
-#include "platform/peerconnection/RTCConfiguration.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-
-namespace blink {
-
-WebRTCICEServer::WebRTCICEServer(RTCIceServer* iceServer)
- : m_private(iceServer) {}
-
-void WebRTCICEServer::assign(const WebRTCICEServer& other) {
- m_private = other.m_private;
-}
-
-void WebRTCICEServer::reset() {
- m_private.reset();
-}
-
-WebURL WebRTCICEServer::uri() const {
- ASSERT(!isNull());
- return m_private->uri();
-}
-
-WebString WebRTCICEServer::username() const {
- ASSERT(!isNull());
- return m_private->username();
-}
-
-WebString WebRTCICEServer::credential() const {
- ASSERT(!isNull());
- return m_private->credential();
-}
-
-WebRTCConfiguration::WebRTCConfiguration(RTCConfiguration* configuration)
- : m_private(configuration) {}
-
-void WebRTCConfiguration::assign(const WebRTCConfiguration& other) {
- m_private = other.m_private;
-}
-
-void WebRTCConfiguration::reset() {
- m_private.reset();
-}
-
-size_t WebRTCConfiguration::numberOfServers() const {
- ASSERT(!isNull());
- return m_private->numberOfServers();
-}
-
-WebRTCICEServer WebRTCConfiguration::server(size_t index) const {
- ASSERT(!isNull());
- return WebRTCICEServer(m_private->server(index));
-}
-
-WebRTCIceTransports WebRTCConfiguration::iceTransports() const {
- ASSERT(!isNull());
- switch (m_private->iceTransports()) {
- case RTCIceTransportsNone:
- return WebRTCIceTransportsNone;
- case RTCIceTransportsRelay:
- return WebRTCIceTransportsRelay;
- case RTCIceTransportsAll:
- return WebRTCIceTransportsAll;
- default:
- ASSERT_NOT_REACHED();
- }
- return WebRTCIceTransportsAll;
-}
-
-WebRTCBundlePolicy WebRTCConfiguration::bundlePolicy() const {
- ASSERT(!isNull());
- switch (m_private->bundlePolicy()) {
- case RTCBundlePolicyBalanced:
- return WebRTCBundlePolicyBalanced;
- case RTCBundlePolicyMaxCompat:
- return WebRTCBundlePolicyMaxCompat;
- case RTCBundlePolicyMaxBundle:
- return WebRTCBundlePolicyMaxBundle;
- default:
- ASSERT_NOT_REACHED();
- }
- return WebRTCBundlePolicyBalanced;
-}
-
-WebRTCRtcpMuxPolicy WebRTCConfiguration::rtcpMuxPolicy() const {
- ASSERT(!isNull());
- switch (m_private->rtcpMuxPolicy()) {
- case RTCRtcpMuxPolicyNegotiate:
- return WebRTCRtcpMuxPolicyNegotiate;
- case RTCRtcpMuxPolicyRequire:
- return WebRTCRtcpMuxPolicyRequire;
- default:
- ASSERT_NOT_REACHED();
- }
- return WebRTCRtcpMuxPolicyNegotiate;
-}
-
-size_t WebRTCConfiguration::numberOfCertificates() const {
- ASSERT(!isNull());
- return m_private->numberOfCertificates();
-}
-
-WebRTCCertificate* WebRTCConfiguration::certificate(size_t index) const {
- ASSERT(!isNull());
- return m_private->certificate(index);
-}
-
-} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/WebKit/Source/platform/peerconnection/RTCConfiguration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698