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

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

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaKeySession_h 26 #ifndef MediaKeySession_h
27 #define MediaKeySession_h 27 #define MediaKeySession_h
28 28
29 #include "bindings/v8/ScriptWrappable.h" 29 #include "bindings/v8/ScriptWrappable.h"
30 #include "core/dom/ContextLifecycleObserver.h" 30 #include "core/dom/ContextLifecycleObserver.h"
31 #include "core/dom/EventTarget.h" 31 #include "core/dom/EventTarget.h"
32 #include "core/dom/ExceptionCode.h"
32 #include "core/platform/Timer.h" 33 #include "core/platform/Timer.h"
33 #include "core/platform/graphics/ContentDecryptionModuleSession.h" 34 #include "core/platform/graphics/ContentDecryptionModuleSession.h"
34 #include "wtf/Deque.h" 35 #include "wtf/Deque.h"
35 #include "wtf/PassRefPtr.h" 36 #include "wtf/PassRefPtr.h"
36 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
37 #include "wtf/Uint8Array.h" 38 #include "wtf/Uint8Array.h"
38 #include "wtf/text/WTFString.h" 39 #include "wtf/text/WTFString.h"
39 40
40 namespace WebCore { 41 namespace WebCore {
41 42
42 class ContentDecryptionModule;
43 class ContentDecryptionModuleSession;
44 class ExceptionState;
45 class GenericEventQueue; 43 class GenericEventQueue;
46 class MediaKeyError; 44 class MediaKeyError;
47 class MediaKeys; 45 class MediaKeys;
46 class ContentDecryptionModule;
47 class ContentDecryptionModuleSession;
48 48
49 // References are held by JS and MediaKeys. 49 // References are held by JS and MediaKeys.
50 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on, 50 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on,
51 // it may outlive any references to it as long as the MediaKeys object is alive. 51 // it may outlive any references to it as long as the MediaKeys object is alive.
52 // The ContentDecryptionModuleSession has the same lifetime as this object. 52 // The ContentDecryptionModuleSession has the same lifetime as this object.
53 class MediaKeySession 53 class MediaKeySession
54 : public RefCounted<MediaKeySession>, public ScriptWrappable, public EventTa rget, public ContextLifecycleObserver 54 : public RefCounted<MediaKeySession>, public ScriptWrappable, public EventTa rget, public ContextLifecycleObserver
55 , private ContentDecryptionModuleSessionClient { 55 , private ContentDecryptionModuleSessionClient {
56 public: 56 public:
57 static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, ContentDe cryptionModule*, MediaKeys*); 57 static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, ContentDe cryptionModule*, MediaKeys*);
58 ~MediaKeySession(); 58 ~MediaKeySession();
59 59
60 const String& keySystem() const { return m_keySystem; } 60 const String& keySystem() const { return m_keySystem; }
61 String sessionId() const; 61 String sessionId() const;
62 62
63 void setError(MediaKeyError*); 63 void setError(MediaKeyError*);
64 MediaKeyError* error() { return m_error.get(); } 64 MediaKeyError* error() { return m_error.get(); }
65 65
66 void generateKeyRequest(const String& mimeType, Uint8Array* initData); 66 void generateKeyRequest(const String& mimeType, Uint8Array* initData);
67 void update(Uint8Array* key, ExceptionState&); 67 void update(Uint8Array* key, ExceptionCode&);
68 void close(); 68 void close();
69 69
70 using RefCounted<MediaKeySession>::ref; 70 using RefCounted<MediaKeySession>::ref;
71 using RefCounted<MediaKeySession>::deref; 71 using RefCounted<MediaKeySession>::deref;
72 72
73 void enqueueEvent(PassRefPtr<Event>); 73 void enqueueEvent(PassRefPtr<Event>);
74 74
75 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 75 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
76 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 76 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
77 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); 77 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; } 114 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; }
115 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; } 115 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; }
116 116
117 EventTargetData m_eventTargetData; 117 EventTargetData m_eventTargetData;
118 }; 118 };
119 119
120 } 120 }
121 121
122 #endif // MediaKeySession_h 122 #endif // MediaKeySession_h
OLDNEW
« no previous file with comments | « Source/modules/crypto/SubtleCrypto.cpp ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698