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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/RTCConfiguration.h

Issue 1865913005: Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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) 2015 Google Inc. All rights reserved. 2 * Copyright (C) 2015 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 size_t numberOfServers() { return m_servers.size(); } 90 size_t numberOfServers() { return m_servers.size(); }
91 RTCIceServer* server(size_t index) { return m_servers[index].get(); } 91 RTCIceServer* server(size_t index) { return m_servers[index].get(); }
92 92
93 void setIceTransports(RTCIceTransports iceTransports) { m_iceTransports = ic eTransports; } 93 void setIceTransports(RTCIceTransports iceTransports) { m_iceTransports = ic eTransports; }
94 RTCIceTransports iceTransports() { return m_iceTransports; } 94 RTCIceTransports iceTransports() { return m_iceTransports; }
95 void setBundlePolicy(RTCBundlePolicy bundlePolicy) { m_bundlePolicy = bundle Policy; } 95 void setBundlePolicy(RTCBundlePolicy bundlePolicy) { m_bundlePolicy = bundle Policy; }
96 RTCBundlePolicy bundlePolicy() { return m_bundlePolicy; } 96 RTCBundlePolicy bundlePolicy() { return m_bundlePolicy; }
97 void setRtcpMuxPolicy(RTCRtcpMuxPolicy rtcpMuxPolicy) { m_rtcpMuxPolicy = rt cpMuxPolicy; } 97 void setRtcpMuxPolicy(RTCRtcpMuxPolicy rtcpMuxPolicy) { m_rtcpMuxPolicy = rt cpMuxPolicy; }
98 RTCRtcpMuxPolicy rtcpMuxPolicy() { return m_rtcpMuxPolicy; } 98 RTCRtcpMuxPolicy rtcpMuxPolicy() { return m_rtcpMuxPolicy; }
99 99
100 void appendCertificate(WebPassOwnPtr<WebRTCCertificate> certificate) { m_cer tificates.append(certificate.release()); } 100 void appendCertificate(std::unique_ptr<WebRTCCertificate> certificate) { m_c ertificates.append(adoptPtr(certificate.release())); }
101 size_t numberOfCertificates() const { return m_certificates.size(); } 101 size_t numberOfCertificates() const { return m_certificates.size(); }
102 WebRTCCertificate* certificate(size_t index) const { return m_certificates[i ndex].get(); } 102 WebRTCCertificate* certificate(size_t index) const { return m_certificates[i ndex].get(); }
103 103
104 DEFINE_INLINE_TRACE() { visitor->trace(m_servers); } 104 DEFINE_INLINE_TRACE() { visitor->trace(m_servers); }
105 105
106 private: 106 private:
107 RTCConfiguration() : 107 RTCConfiguration() :
108 m_iceTransports(RTCIceTransportsAll), 108 m_iceTransports(RTCIceTransportsAll),
109 m_bundlePolicy(RTCBundlePolicyBalanced), 109 m_bundlePolicy(RTCBundlePolicyBalanced),
110 m_rtcpMuxPolicy(RTCRtcpMuxPolicyNegotiate) { } 110 m_rtcpMuxPolicy(RTCRtcpMuxPolicyNegotiate) { }
111 111
112 HeapVector<Member<RTCIceServer>> m_servers; 112 HeapVector<Member<RTCIceServer>> m_servers;
113 RTCIceTransports m_iceTransports; 113 RTCIceTransports m_iceTransports;
114 RTCBundlePolicy m_bundlePolicy; 114 RTCBundlePolicy m_bundlePolicy;
115 RTCRtcpMuxPolicy m_rtcpMuxPolicy; 115 RTCRtcpMuxPolicy m_rtcpMuxPolicy;
116 Vector<OwnPtr<WebRTCCertificate>> m_certificates; 116 Vector<OwnPtr<WebRTCCertificate>> m_certificates;
117 }; 117 };
118 118
119 } // namespace blink 119 } // namespace blink
120 120
121 #endif // RTCConfiguration_h 121 #endif // RTCConfiguration_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/TimerTest.cpp ('k') | third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698