Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h - Issue 759443005: Replace MediaKeySystemOptions with MediaKeySystemConfiguration.

Side by Side Diff: Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h

Issue 759443005: Replace MediaKeySystemOptions with MediaKeySystemConfiguration. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Update Created 6 years 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

« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySystemOptions.idl ('k') | Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 NavigatorRequestMediaKeySystemAccess_h	5 #ifndef NavigatorRequestMediaKeySystemAccess_h

6 #define NavigatorRequestMediaKeySystemAccess_h	6 #define NavigatorRequestMediaKeySystemAccess_h

7	7

8 #include "bindings/core/v8/Dictionary.h"

9 #include "bindings/core/v8/ScriptPromise.h"	8 #include "bindings/core/v8/ScriptPromise.h"

10 #include "bindings/core/v8/V8Binding.h"	9 #include "bindings/modules/v8/V8MediaKeySystemConfiguration.h"

11 #include "bindings/modules/v8/V8MediaKeySystemOptions.h"

12 #include "core/frame/Navigator.h"	10 #include "core/frame/Navigator.h"

13 #include "modules/encryptedmedia/MediaKeySystemOptions.h"	11 #include "modules/encryptedmedia/MediaKeySystemConfiguration.h"

14 #include "platform/Supplementable.h"	12 #include "platform/Supplementable.h"

15 #include "platform/heap/Handle.h"	13 #include "wtf/Vector.h"

16	14

17 namespace blink {	15 namespace blink {

18	16

19 class NavigatorRequestMediaKeySystemAccess final : public NoBaseWillBeGarbageCol lectedFinalized<NavigatorRequestMediaKeySystemAccess>, public WillBeHeapSuppleme nt<Navigator> {	17 class NavigatorRequestMediaKeySystemAccess final : public NoBaseWillBeGarbageCol lectedFinalized<NavigatorRequestMediaKeySystemAccess>, public WillBeHeapSuppleme nt<Navigator> {

20 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorRequestMediaKeySystemAccess);	18 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorRequestMediaKeySystemAccess);

21 public:	19 public:

22 virtual ~NavigatorRequestMediaKeySystemAccess();	20 virtual ~NavigatorRequestMediaKeySystemAccess();

23	21

24 static NavigatorRequestMediaKeySystemAccess& from(Navigator&);	22 static NavigatorRequestMediaKeySystemAccess& from(Navigator&);

25	23

26 static ScriptPromise requestMediaKeySystemAccess(	24 static ScriptPromise requestMediaKeySystemAccess(

27 ScriptState*,	25 ScriptState*,

28 Navigator&,	26 Navigator&,

29 const String& keySystem);	27 const String& keySystem);

30 static ScriptPromise requestMediaKeySystemAccess(	28 static ScriptPromise requestMediaKeySystemAccess(

31 ScriptState*,	29 ScriptState*,

32 Navigator&,	30 Navigator&,

33 const String& keySystem,	31 const String& keySystem,

34 const Vector<MediaKeySystemOptions>& supportedConfigurations);	32 const Vector<MediaKeySystemConfiguration>& supportedConfigurations);

35	33

36 ScriptPromise requestMediaKeySystemAccess(	34 ScriptPromise requestMediaKeySystemAccess(

37 ScriptState*,	35 ScriptState*,

38 const String& keySystem,	36 const String& keySystem,

39 const Vector<MediaKeySystemOptions>& supportedConfigurations);	37 const Vector<MediaKeySystemConfiguration>& supportedConfigurations);

40	38

41 virtual void trace(Visitor*) override;	39 virtual void trace(Visitor*) override;

42	40

43 private:	41 private:

44 NavigatorRequestMediaKeySystemAccess();	42 NavigatorRequestMediaKeySystemAccess();

45 static const char* supplementName();	43 static const char* supplementName();

46 };	44 };

47	45

48 } // namespace blink	46 } // namespace blink

49	47

50 #endif // NavigatorRequestMediaKeySystemAccess_h	48 #endif // NavigatorRequestMediaKeySystemAccess_h

OLD	NEW