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

Unified Diff: Source/platform/mediastream/RTCConfiguration.h

Issue 1311853005: RTCCertificate and RTCPeerConnection.generateCertificate added to JavaScript (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge with master Created 5 years, 3 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: Source/platform/mediastream/RTCConfiguration.h
diff --git a/Source/platform/mediastream/RTCConfiguration.h b/Source/platform/mediastream/RTCConfiguration.h
index 157d5343fe79c2c01b2567345350004b961684c2..9235aa4b6270c0f24e2e1b3140c370fa825618f9 100644
--- a/Source/platform/mediastream/RTCConfiguration.h
+++ b/Source/platform/mediastream/RTCConfiguration.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2015 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
#include "platform/heap/Handle.h"
#include "platform/weborigin/KURL.h"
+#include "public/platform/WebRTCCertificate.h"
#include "wtf/PassRefPtr.h"
#include "wtf/Vector.h"
#include "wtf/text/WTFString.h"
@@ -99,10 +100,12 @@ enum RTCRtcpMuxPolicy {
RTCRtcpMuxPolicyRequire
};
-class RTCConfiguration final : public GarbageCollected<RTCConfiguration> {
+class PLATFORM_EXPORT RTCConfiguration final : public GarbageCollectedFinalized<RTCConfiguration> {
public:
static RTCConfiguration* create() { return new RTCConfiguration(); }
+ ~RTCConfiguration();
+
void setIceTransports(RTCIceTransports iceTransports) { m_iceTransports = iceTransports; }
RTCIceTransports iceTransports() { return m_iceTransports; }
void setBundlePolicy(RTCBundlePolicy bundlePolicy) { m_bundlePolicy = bundlePolicy; }
@@ -111,6 +114,9 @@ public:
RTCRtcpMuxPolicy rtcpMuxPolicy() { return m_rtcpMuxPolicy; }
void setIceServers(RTCIceServerArray* iceServers) { m_iceServers = iceServers; }
RTCIceServerArray* iceServers() { return m_iceServers.get(); }
+ void appendCertificate(WebRTCCertificate* certificate) { m_certificates.append(certificate); }
+ size_t numberOfCertificates() const { return m_certificates.size(); }
+ WebRTCCertificate* certificate(size_t index) const { return m_certificates[index]; }
DEFINE_INLINE_TRACE() { visitor->trace(m_iceServers); }
@@ -126,6 +132,7 @@ private:
RTCIceTransports m_iceTransports;
RTCBundlePolicy m_bundlePolicy;
RTCRtcpMuxPolicy m_rtcpMuxPolicy;
+ Vector<WebRTCCertificate*> m_certificates;
jochen (gone - plz use gerrit) 2015/09/22 15:48:53 why not Vector<OwnPtr<WebRTCCertificate>> ?
hbos_chromium 2015/09/28 08:10:16 Done.
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698