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

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

Issue 651503002: Clean up forward declarations 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 /* 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 MediaKeys_h 26 #ifndef MediaKeys_h
27 #define MediaKeys_h 27 #define MediaKeys_h
28 28
29 #include "bindings/core/v8/ScriptPromise.h" 29 #include "bindings/core/v8/ScriptPromise.h"
30 #include "bindings/core/v8/ScriptWrappable.h" 30 #include "bindings/core/v8/ScriptWrappable.h"
31 #include "core/dom/ContextLifecycleObserver.h" 31 #include "core/dom/ContextLifecycleObserver.h"
32 #include "wtf/Forward.h"
33 #include "wtf/text/WTFString.h"
34 32
35 namespace blink { 33 namespace blink {
36 34
37 class ExceptionState;
38 class ExecutionContext; 35 class ExecutionContext;
39 class HTMLMediaElement;
40 class MediaKeySession; 36 class MediaKeySession;
41 class ScriptState; 37 class ScriptState;
42 class WebContentDecryptionModule; 38 class WebContentDecryptionModule;
43 39
44 // References are held by JS and HTMLMediaElement. 40 // References are held by JS and HTMLMediaElement.
45 // The WebContentDecryptionModule has the same lifetime as this object. 41 // The WebContentDecryptionModule has the same lifetime as this object.
46 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLif ecycleObserver, public ScriptWrappable { 42 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLif ecycleObserver, public ScriptWrappable {
47 DEFINE_WRAPPERTYPEINFO(); 43 DEFINE_WRAPPERTYPEINFO();
48 public: 44 public:
49 static ScriptPromise create(ScriptState*, const String& keySystem); 45 static ScriptPromise create(ScriptState*, const String& keySystem);
(...skipping 16 matching lines...) Expand all
66 friend class MediaKeysInitializer; 62 friend class MediaKeysInitializer;
67 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>); 63 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>);
68 64
69 const String m_keySystem; 65 const String m_keySystem;
70 OwnPtr<blink::WebContentDecryptionModule> m_cdm; 66 OwnPtr<blink::WebContentDecryptionModule> m_cdm;
71 }; 67 };
72 68
73 } // namespace blink 69 } // namespace blink
74 70
75 #endif // MediaKeys_h 71 #endif // MediaKeys_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698