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

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp

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.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
similarity index 78%
copy from third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h
copy to third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
index d162c8bd250142a2fc8a24654272c73cdb04a22d..da5111e8f80c6a760df154d526f9caa59f6fb922 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h
+++ b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
@@ -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,25 +28,24 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaConstraintsImpl_h
-#define MediaConstraintsImpl_h
-
-#include "public/platform/WebMediaConstraints.h"
+#include "config.h"
+#include "modules/mediastream/RTCCertificate.h"
namespace blink {
-class Dictionary;
-class ExceptionState;
-
-namespace MediaConstraintsImpl {
+double RTCCertificate::expires() const
+{
+ return m_certificate->expires();
+}
-WebMediaConstraints create();
-WebMediaConstraints create(const Dictionary&, ExceptionState&);
+RTCCertificate::RTCCertificate(WebRTCCertificate* certificate)
+ : m_certificate(adoptPtr(certificate))
+{
+}
+WebRTCCertificate* RTCCertificate::certificateShallowCopy() const
+{
+ return m_certificate->shallowCopy();
}
} // namespace blink
-
-#endif // MediaConstraintsImpl_h
-
-

Powered by Google App Engine
This is Rietveld 408576698