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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/RTCCertificate.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef RTCCertificate_h 31 #ifndef RTCCertificate_h
32 #define RTCCertificate_h 32 #define RTCCertificate_h
33 33
34 #include "bindings/core/v8/ScriptWrappable.h" 34 #include "bindings/core/v8/ScriptWrappable.h"
35 #include "core/dom/DOMTimeStamp.h" 35 #include "core/dom/DOMTimeStamp.h"
36 #include "platform/heap/GarbageCollected.h" 36 #include "platform/heap/GarbageCollected.h"
37 #include "public/platform/WebRTCCertificate.h" 37 #include "public/platform/WebRTCCertificate.h"
38 #include "wtf/OwnPtr.h"
39
38 #include <memory> 40 #include <memory>
39 41
40 namespace blink { 42 namespace blink {
41 43
42 class RTCCertificate final : public GarbageCollectedFinalized<RTCCertificate>, p ublic ScriptWrappable { 44 class RTCCertificate final : public GarbageCollectedFinalized<RTCCertificate>, p ublic ScriptWrappable {
43 DEFINE_WRAPPERTYPEINFO(); 45 DEFINE_WRAPPERTYPEINFO();
44 public: 46 public:
45 // Takes ownership of the certificate. 47 // Takes ownership of the certificate.
46 RTCCertificate(std::unique_ptr<WebRTCCertificate>); 48 RTCCertificate(std::unique_ptr<WebRTCCertificate>);
47 49
48 // Returns a new WebRTCCertificate shallow copy. 50 // Returns a new WebRTCCertificate shallow copy.
49 std::unique_ptr<WebRTCCertificate> certificateShallowCopy() const; 51 std::unique_ptr<WebRTCCertificate> certificateShallowCopy() const;
50 const WebRTCCertificate& certificate() const { return *m_certificate; } 52 const WebRTCCertificate& certificate() const { return *m_certificate; }
51 53
52 DEFINE_INLINE_TRACE() {} 54 DEFINE_INLINE_TRACE() {}
53 55
54 // Returns the expiration time in ms relative to epoch, 1970-01-01T00:00:00Z . 56 // Returns the expiration time in ms relative to epoch, 1970-01-01T00:00:00Z .
55 DOMTimeStamp expires() const; 57 DOMTimeStamp expires() const;
56 58
57 private: 59 private:
58 std::unique_ptr<WebRTCCertificate> m_certificate; 60 OwnPtr<WebRTCCertificate> m_certificate;
59 }; 61 };
60 62
61 } // namespace blink 63 } // namespace blink
62 64
63 #endif // RTCCertificate_h 65 #endif // RTCCertificate_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698