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

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

Issue 1106263003: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeys.h ('k') | Source/modules/fetch/FetchRequestData.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuff er> data) 74 PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuff er> data)
75 : m_result(result) 75 : m_result(result)
76 , m_data(data) 76 , m_data(data)
77 { 77 {
78 } 78 }
79 79
80 const Member<ContentDecryptionModuleResult> m_result; 80 const Member<ContentDecryptionModuleResult> m_result;
81 const RefPtr<DOMArrayBuffer> m_data; 81 const RefPtr<DOMArrayBuffer> m_data;
82 }; 82 };
83 83
84 MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, const b link::WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr <WebContentDecryptionModule> cdm) 84 MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, const W ebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebCon tentDecryptionModule> cdm)
85 : ContextLifecycleObserver(context) 85 : ContextLifecycleObserver(context)
86 , m_keySystem(keySystem) 86 , m_keySystem(keySystem)
87 , m_supportedSessionTypes(supportedSessionTypes) 87 , m_supportedSessionTypes(supportedSessionTypes)
88 , m_cdm(cdm) 88 , m_cdm(cdm)
89 , m_timer(this, &MediaKeys::timerFired) 89 , m_timer(this, &MediaKeys::timerFired)
90 { 90 {
91 WTF_LOG(Media, "MediaKeys(%p)::MediaKeys", this); 91 WTF_LOG(Media, "MediaKeys(%p)::MediaKeys", this);
92 92
93 // Step 4.4 of MediaKeys::create(): 93 // Step 4.4 of MediaKeys::create():
94 // 4.4.1 Set the keySystem attribute to keySystem. 94 // 4.4.1 Set the keySystem attribute to keySystem.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 void MediaKeys::contextDestroyed() 210 void MediaKeys::contextDestroyed()
211 { 211 {
212 ContextLifecycleObserver::contextDestroyed(); 212 ContextLifecycleObserver::contextDestroyed();
213 213
214 // We don't need the CDM anymore. 214 // We don't need the CDM anymore.
215 m_cdm.clear(); 215 m_cdm.clear();
216 } 216 }
217 217
218 } // namespace blink 218 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeys.h ('k') | Source/modules/fetch/FetchRequestData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698