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

Unified Diff: third_party/WebKit/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: Chromium implementation of Blink interfaces. Addressed comments. 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: third_party/WebKit/Source/platform/mediastream/RTCConfiguration.h
diff --git a/third_party/WebKit/Source/platform/mediastream/RTCConfiguration.h b/third_party/WebKit/Source/platform/mediastream/RTCConfiguration.h
index 157d5343fe79c2c01b2567345350004b961684c2..0443d87315c48531ebce76d0272b0f8410cdca41 100644
--- a/third_party/WebKit/Source/platform/mediastream/RTCConfiguration.h
+++ b/third_party/WebKit/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,7 +100,7 @@ enum RTCRtcpMuxPolicy {
RTCRtcpMuxPolicyRequire
};
-class RTCConfiguration final : public GarbageCollected<RTCConfiguration> {
+class PLATFORM_EXPORT RTCConfiguration final : public GarbageCollectedFinalized<RTCConfiguration> {
public:
static RTCConfiguration* create() { return new RTCConfiguration(); }
@@ -111,6 +112,10 @@ public:
RTCRtcpMuxPolicy rtcpMuxPolicy() { return m_rtcpMuxPolicy; }
void setIceServers(RTCIceServerArray* iceServers) { m_iceServers = iceServers; }
RTCIceServerArray* iceServers() { return m_iceServers.get(); }
+ // Takes ownership of |certificate|.
+ void appendCertificate(WebRTCCertificate* certificate) { m_certificates.append(adoptPtr(certificate)); }
+ size_t numberOfCertificates() const { return m_certificates.size(); }
+ WebRTCCertificate* certificate(size_t index) const { return m_certificates[index].get(); }
DEFINE_INLINE_TRACE() { visitor->trace(m_iceServers); }
@@ -126,6 +131,7 @@ private:
RTCIceTransports m_iceTransports;
RTCBundlePolicy m_bundlePolicy;
RTCRtcpMuxPolicy m_rtcpMuxPolicy;
+ Vector<OwnPtr<WebRTCCertificate>> m_certificates;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698