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

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

Issue 26975004: Move ContentDecryptionModule* to platform/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add NON_EXPORTED_BASE macro Created 7 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 | 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 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/encryptedmedia/MediaKeySession.h" 27 #include "modules/encryptedmedia/MediaKeySession.h"
28 28
29 #include "bindings/v8/ExceptionState.h" 29 #include "bindings/v8/ExceptionState.h"
30 #include "core/events/Event.h" 30 #include "core/events/Event.h"
31 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
32 #include "core/events/GenericEventQueue.h" 32 #include "core/events/GenericEventQueue.h"
33 #include "core/html/MediaKeyError.h" 33 #include "core/html/MediaKeyError.h"
34 #include "core/platform/graphics/ContentDecryptionModule.h"
35 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" 34 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
36 #include "modules/encryptedmedia/MediaKeys.h" 35 #include "modules/encryptedmedia/MediaKeys.h"
36 #include "platform/drm/ContentDecryptionModule.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 PassRefPtr<MediaKeySession> MediaKeySession::create(ExecutionContext* context, C ontentDecryptionModule* cdm, MediaKeys* keys) 40 PassRefPtr<MediaKeySession> MediaKeySession::create(ExecutionContext* context, C ontentDecryptionModule* cdm, MediaKeys* keys)
41 { 41 {
42 return adoptRef(new MediaKeySession(context, cdm, keys)); 42 return adoptRef(new MediaKeySession(context, cdm, keys));
43 } 43 }
44 44
45 MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionMod ule* cdm, MediaKeys* keys) 45 MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionMod ule* cdm, MediaKeys* keys)
46 : ContextLifecycleObserver(context) 46 : ContextLifecycleObserver(context)
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 { 197 {
198 return EventTargetNames::MediaKeySession; 198 return EventTargetNames::MediaKeySession;
199 } 199 }
200 200
201 ExecutionContext* MediaKeySession::executionContext() const 201 ExecutionContext* MediaKeySession::executionContext() const
202 { 202 {
203 return ContextLifecycleObserver::executionContext(); 203 return ContextLifecycleObserver::executionContext();
204 } 204 }
205 205
206 } 206 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698