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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.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 10 matching lines...) Expand all
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
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 MediaKeys_h 26 #ifndef MediaKeys_h
27 #define MediaKeys_h 27 #define MediaKeys_h
28 28
29 #include "bindings/v8/ScriptWrappable.h" 29 #include "bindings/v8/ScriptWrappable.h"
30 #include "core/dom/EventTarget.h" 30 #include "core/dom/EventTarget.h"
31 #include "core/dom/ExceptionCode.h"
31 #include "wtf/OwnPtr.h" 32 #include "wtf/OwnPtr.h"
32 #include "wtf/PassRefPtr.h" 33 #include "wtf/PassRefPtr.h"
33 #include "wtf/RefCounted.h" 34 #include "wtf/RefCounted.h"
34 #include "wtf/Uint8Array.h" 35 #include "wtf/Uint8Array.h"
35 #include "wtf/Vector.h" 36 #include "wtf/Vector.h"
36 #include "wtf/text/WTFString.h" 37 #include "wtf/text/WTFString.h"
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
40 class ContentDecryptionModule; 41 class ContentDecryptionModule;
41 class MediaKeySession; 42 class MediaKeySession;
42 class HTMLMediaElement; 43 class HTMLMediaElement;
43 class ExceptionState;
44 44
45 // References are held by JS and HTMLMediaElement. 45 // References are held by JS and HTMLMediaElement.
46 // The ContentDecryptionModule has the same lifetime as this object. 46 // The ContentDecryptionModule has the same lifetime as this object.
47 // Maintains a reference to all MediaKeySessions created to ensure they live as 47 // Maintains a reference to all MediaKeySessions created to ensure they live as
48 // long as this object unless explicitly close()'d. 48 // long as this object unless explicitly close()'d.
49 class MediaKeys : public RefCounted<MediaKeys>, public ScriptWrappable { 49 class MediaKeys : public RefCounted<MediaKeys>, public ScriptWrappable {
50 public: 50 public:
51 static PassRefPtr<MediaKeys> create(const String& keySystem, ExceptionState& ); 51 static PassRefPtr<MediaKeys> create(const String& keySystem, ExceptionCode&) ;
52 ~MediaKeys(); 52 ~MediaKeys();
53 53
54 PassRefPtr<MediaKeySession> createSession(ScriptExecutionContext*, const Str ing& mimeType, Uint8Array* initData, ExceptionState&); 54 PassRefPtr<MediaKeySession> createSession(ScriptExecutionContext*, const Str ing& mimeType, Uint8Array* initData, ExceptionCode&);
55 55
56 const String& keySystem() const { return m_keySystem; } 56 const String& keySystem() const { return m_keySystem; }
57 57
58 void setMediaElement(HTMLMediaElement*); 58 void setMediaElement(HTMLMediaElement*);
59 59
60 protected: 60 protected:
61 MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule>); 61 MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule>);
62 62
63 Vector<RefPtr<MediaKeySession> > m_sessions; 63 Vector<RefPtr<MediaKeySession> > m_sessions;
64 64
65 HTMLMediaElement* m_mediaElement; 65 HTMLMediaElement* m_mediaElement;
66 const String m_keySystem; 66 const String m_keySystem;
67 OwnPtr<ContentDecryptionModule> m_cdm; 67 OwnPtr<ContentDecryptionModule> m_cdm;
68 }; 68 };
69 69
70 } 70 }
71 71
72 #endif // MediaKeys_h 72 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698