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

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCCertificate.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/modules/mediastream/RTCCertificate.h
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.h
similarity index 61%
copy from third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h
copy to third_party/WebKit/Source/modules/mediastream/RTCCertificate.h
index 2ef5d77cf9e5c3273e5746f9ec1f4dbda533ac65..efd8c25afe409ef766e1218e43d2b7123bfed695 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h
+++ b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.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
@@ -28,43 +28,41 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef RTCSessionDescription_h
-#define RTCSessionDescription_h
+#ifndef RTCCertificate_h
+#define RTCCertificate_h
#include "bindings/core/v8/ScriptWrappable.h"
-#include "public/platform/WebRTCSessionDescription.h"
-#include "wtf/Forward.h"
+#include "platform/heap/GarbageCollected.h"
+#include "public/platform/WebRTCCertificate.h"
+#include "wtf/OwnPtr.h"
namespace blink {
-class RTCSessionDescriptionInit;
-class ScriptState;
-class ScriptValue;
-
-class RTCSessionDescription final : public GarbageCollectedFinalized<RTCSessionDescription>, public ScriptWrappable {
+class RTCCertificate final : public GarbageCollectedFinalized<RTCCertificate>, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
- static RTCSessionDescription* create(const RTCSessionDescriptionInit&);
- static RTCSessionDescription* create(WebRTCSessionDescription);
+ // Visible to the JavaScript world in accordance with the .idl file:
- String type();
- void setType(const String&);
+ // The date and time after which the certificate should be considered
+ // invalid. Return type is really a Date, the double expresses the time
+ // since 1970-01-01T00:00:00Z in milliseconds.
+ double expires() const;
- String sdp();
- void setSdp(const String&);
+ // Hidden from the JavaScript world:
- ScriptValue toJSONForBinding(ScriptState*);
+ // Takes ownership of |certificate|.
+ RTCCertificate(WebRTCCertificate* /*certificate*/);
- WebRTCSessionDescription webSessionDescription();
+ // Returns a new WebRTCCertificate shallow copy that the caller is
+ // responsible for deleting.
+ WebRTCCertificate* certificateShallowCopy() const;
- DEFINE_INLINE_TRACE() { }
+ DEFINE_INLINE_TRACE() {}
private:
- explicit RTCSessionDescription(WebRTCSessionDescription);
-
- WebRTCSessionDescription m_webSessionDescription;
+ OwnPtr<WebRTCCertificate> m_certificate;
};
} // namespace blink
-#endif // RTCSessionDescription_h
+#endif // RTCCertificate_h
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698