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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MediaKeySystemAccess_h 5 #ifndef MediaKeySystemAccess_h
6 #define MediaKeySystemAccess_h 6 #define MediaKeySystemAccess_h
7 7
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptWrappable.h" 9 #include "bindings/core/v8/ScriptWrappable.h"
10 #include "modules/encryptedmedia/MediaKeySystemConfiguration.h" 10 #include "modules/encryptedmedia/MediaKeySystemConfiguration.h"
11 #include "public/platform/WebContentDecryptionModuleAccess.h" 11 #include "public/platform/WebContentDecryptionModuleAccess.h"
12 #include "wtf/Forward.h" 12 #include "wtf/Forward.h"
13 #include <memory>
14 13
15 namespace blink { 14 namespace blink {
16 15
17 class MediaKeySystemAccess final : public GarbageCollectedFinalized<MediaKeySyst emAccess>, public ScriptWrappable { 16 class MediaKeySystemAccess final : public GarbageCollectedFinalized<MediaKeySyst emAccess>, public ScriptWrappable {
18 DEFINE_WRAPPERTYPEINFO(); 17 DEFINE_WRAPPERTYPEINFO();
19 18
20 public: 19 public:
21 MediaKeySystemAccess(const String& keySystem, std::unique_ptr<WebContentDecr yptionModuleAccess>); 20 MediaKeySystemAccess(const String& keySystem, PassOwnPtr<WebContentDecryptio nModuleAccess>);
22 virtual ~MediaKeySystemAccess(); 21 virtual ~MediaKeySystemAccess();
23 22
24 const String& keySystem() const { return m_keySystem; } 23 const String& keySystem() const { return m_keySystem; }
25 void getConfiguration(MediaKeySystemConfiguration& result); 24 void getConfiguration(MediaKeySystemConfiguration& result);
26 ScriptPromise createMediaKeys(ScriptState*); 25 ScriptPromise createMediaKeys(ScriptState*);
27 26
28 DECLARE_TRACE(); 27 DECLARE_TRACE();
29 28
30 private: 29 private:
31 const String m_keySystem; 30 const String m_keySystem;
32 std::unique_ptr<WebContentDecryptionModuleAccess> m_access; 31 OwnPtr<WebContentDecryptionModuleAccess> m_access;
33 }; 32 };
34 33
35 } // namespace blink 34 } // namespace blink
36 35
37 #endif // MediaKeySystemAccess_h 36 #endif // MediaKeySystemAccess_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698