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

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

Issue 1248353002: Oilpan: fix build after r199375. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: finalize HTMLMediaElementEncryptedMedia, now needed Created 5 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
« no previous file with comments | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" 6 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 ScriptPromiseResolver::trace(visitor); 290 ScriptPromiseResolver::trace(visitor);
291 } 291 }
292 292
293 HTMLMediaElementEncryptedMedia::HTMLMediaElementEncryptedMedia(HTMLMediaElement& element) 293 HTMLMediaElementEncryptedMedia::HTMLMediaElementEncryptedMedia(HTMLMediaElement& element)
294 : m_mediaElement(element) 294 : m_mediaElement(element)
295 , m_emeMode(EmeModeNotSelected) 295 , m_emeMode(EmeModeNotSelected)
296 , m_isWaitingForKey(false) 296 , m_isWaitingForKey(false)
297 { 297 {
298 } 298 }
299 299
300 #if !ENABLE(OILPAN)
301 HTMLMediaElementEncryptedMedia::~HTMLMediaElementEncryptedMedia() 300 HTMLMediaElementEncryptedMedia::~HTMLMediaElementEncryptedMedia()
302 { 301 {
302 #if !ENABLE(OILPAN)
303 WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::~HTMLMediaElementEncryptedMe dia"); 303 WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::~HTMLMediaElementEncryptedMe dia");
304 if (m_mediaKeys) 304 if (m_mediaKeys)
305 m_mediaKeys->clearMediaElement(); 305 m_mediaKeys->clearMediaElement();
306 #endif
306 } 307 }
307 #endif
308 308
309 const char* HTMLMediaElementEncryptedMedia::supplementName() 309 const char* HTMLMediaElementEncryptedMedia::supplementName()
310 { 310 {
311 return "HTMLMediaElementEncryptedMedia"; 311 return "HTMLMediaElementEncryptedMedia";
312 } 312 }
313 313
314 HTMLMediaElementEncryptedMedia& HTMLMediaElementEncryptedMedia::from(HTMLMediaEl ement& element) 314 HTMLMediaElementEncryptedMedia& HTMLMediaElementEncryptedMedia::from(HTMLMediaEl ement& element)
315 { 315 {
316 HTMLMediaElementEncryptedMedia* supplement = static_cast<HTMLMediaElementEnc ryptedMedia*>(WillBeHeapSupplement<HTMLMediaElement>::from(element, supplementNa me())); 316 HTMLMediaElementEncryptedMedia* supplement = static_cast<HTMLMediaElementEnc ryptedMedia*>(WillBeHeapSupplement<HTMLMediaElement>::from(element, supplementNa me()));
317 if (!supplement) { 317 if (!supplement) {
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0; 624 return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0;
625 } 625 }
626 626
627 DEFINE_TRACE(HTMLMediaElementEncryptedMedia) 627 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
628 { 628 {
629 visitor->trace(m_mediaKeys); 629 visitor->trace(m_mediaKeys);
630 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); 630 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
631 } 631 }
632 632
633 } // namespace blink 633 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698