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

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

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 HTMLMediaElementEncryptedMedia_h 5 #ifndef HTMLMediaElementEncryptedMedia_h
6 #define HTMLMediaElementEncryptedMedia_h 6 #define HTMLMediaElementEncryptedMedia_h
7 7
8 #include "modules/EventTargetModules.h" 8 #include "modules/EventTargetModules.h"
9 #include "platform/Supplementable.h" 9 #include "platform/Supplementable.h"
10 #include "platform/graphics/media/MediaPlayer.h" 10 #include "platform/graphics/media/MediaPlayer.h"
11 #include "platform/heap/Handle.h" 11 #include "platform/heap/Handle.h"
12 #include "public/platform/WebMediaPlayerClient.h" 12 #include "public/platform/WebMediaPlayerClient.h"
13 #include "wtf/Forward.h" 13 #include "wtf/Forward.h"
14 14
15 namespace blink { 15 namespace blink {
16 16
17 class ExceptionState; 17 class ExceptionState;
18 class HTMLMediaElement; 18 class HTMLMediaElement;
19 class MediaKeys; 19 class MediaKeys;
20 class ScriptPromise; 20 class ScriptPromise;
21 class ScriptState; 21 class ScriptState;
22 22
23 class HTMLMediaElementEncryptedMedia FINAL : public NoBaseWillBeGarbageCollected <HTMLMediaElementEncryptedMedia>, public WillBeHeapSupplement<HTMLMediaElement> { 23 class HTMLMediaElementEncryptedMedia final : public NoBaseWillBeGarbageCollected <HTMLMediaElementEncryptedMedia>, public WillBeHeapSupplement<HTMLMediaElement> {
24 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia); 24 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);
25 DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLMediaElementEncryptedMe dia); 25 DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLMediaElementEncryptedMe dia);
26 public: 26 public:
27 // encrypted media extensions (v0.1b) 27 // encrypted media extensions (v0.1b)
28 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, PassRefPtr<Uint8Array> initData, ExceptionState&); 28 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, PassRefPtr<Uint8Array> initData, ExceptionState&);
29 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, ExceptionState&); 29 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, ExceptionState&);
30 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, E xceptionState&); 30 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, E xceptionState&);
31 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<Uint8Array> key, ExceptionState&); 31 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<Uint8Array> key, ExceptionState&);
32 static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySyste m, const String& sessionId, ExceptionState&); 32 static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySyste m, const String& sessionId, ExceptionState&);
33 33
(...skipping 10 matching lines...) Expand all
44 static void keyAdded(HTMLMediaElement&, const String& keySystem, const Strin g& sessionId); 44 static void keyAdded(HTMLMediaElement&, const String& keySystem, const Strin g& sessionId);
45 static void keyError(HTMLMediaElement&, const String& keySystem, const Strin g& sessionId, WebMediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode ); 45 static void keyError(HTMLMediaElement&, const String& keySystem, const Strin g& sessionId, WebMediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode );
46 static void keyMessage(HTMLMediaElement&, const String& keySystem, const Str ing& sessionId, const unsigned char* message, unsigned messageLength, const WebU RL& defaultURL); 46 static void keyMessage(HTMLMediaElement&, const String& keySystem, const Str ing& sessionId, const unsigned char* message, unsigned messageLength, const WebU RL& defaultURL);
47 static void keyNeeded(HTMLMediaElement&, const String& contentType, const un signed char* initData, unsigned initDataLength); 47 static void keyNeeded(HTMLMediaElement&, const String& contentType, const un signed char* initData, unsigned initDataLength);
48 static void playerDestroyed(HTMLMediaElement&); 48 static void playerDestroyed(HTMLMediaElement&);
49 static WebContentDecryptionModule* contentDecryptionModule(HTMLMediaElement& ); 49 static WebContentDecryptionModule* contentDecryptionModule(HTMLMediaElement& );
50 50
51 static HTMLMediaElementEncryptedMedia& from(HTMLMediaElement&); 51 static HTMLMediaElementEncryptedMedia& from(HTMLMediaElement&);
52 static const char* supplementName(); 52 static const char* supplementName();
53 53
54 virtual void trace(Visitor*) OVERRIDE; 54 virtual void trace(Visitor*) override;
55 55
56 private: 56 private:
57 friend class SetMediaKeysHandler; 57 friend class SetMediaKeysHandler;
58 58
59 HTMLMediaElementEncryptedMedia(); 59 HTMLMediaElementEncryptedMedia();
60 void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr <Uint8Array> initData, ExceptionState&); 60 void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr <Uint8Array> initData, ExceptionState&);
61 void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionState&) ; 61 void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionState&) ;
62 void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String & sessionId, ExceptionState&); 62 void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String & sessionId, ExceptionState&);
63 63
64 // EventTarget 64 // EventTarget
(...skipping 13 matching lines...) Expand all
78 WebContentDecryptionModule* contentDecryptionModule(); 78 WebContentDecryptionModule* contentDecryptionModule();
79 79
80 EmeMode m_emeMode; 80 EmeMode m_emeMode;
81 81
82 PersistentWillBeMember<MediaKeys> m_mediaKeys; 82 PersistentWillBeMember<MediaKeys> m_mediaKeys;
83 }; 83 };
84 84
85 } // namespace blink 85 } // namespace blink
86 86
87 #endif 87 #endif
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextEncoder.h ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698