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

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

Issue 1846913009: HeapSupplements are now just Supplements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 // 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 "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" 5 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 #endif 293 #endif
294 } 294 }
295 295
296 const char* HTMLMediaElementEncryptedMedia::supplementName() 296 const char* HTMLMediaElementEncryptedMedia::supplementName()
297 { 297 {
298 return "HTMLMediaElementEncryptedMedia"; 298 return "HTMLMediaElementEncryptedMedia";
299 } 299 }
300 300
301 HTMLMediaElementEncryptedMedia& HTMLMediaElementEncryptedMedia::from(HTMLMediaEl ement& element) 301 HTMLMediaElementEncryptedMedia& HTMLMediaElementEncryptedMedia::from(HTMLMediaEl ement& element)
302 { 302 {
303 HTMLMediaElementEncryptedMedia* supplement = static_cast<HTMLMediaElementEnc ryptedMedia*>(HeapSupplement<HTMLMediaElement>::from(element, supplementName())) ; 303 HTMLMediaElementEncryptedMedia* supplement = static_cast<HTMLMediaElementEnc ryptedMedia*>(Supplement<HTMLMediaElement>::from(element, supplementName()));
304 if (!supplement) { 304 if (!supplement) {
305 supplement = new HTMLMediaElementEncryptedMedia(element); 305 supplement = new HTMLMediaElementEncryptedMedia(element);
306 provideTo(element, supplementName(), supplement); 306 provideTo(element, supplementName(), supplement);
307 } 307 }
308 return *supplement; 308 return *supplement;
309 } 309 }
310 310
311 MediaKeys* HTMLMediaElementEncryptedMedia::mediaKeys(HTMLMediaElement& element) 311 MediaKeys* HTMLMediaElementEncryptedMedia::mediaKeys(HTMLMediaElement& element)
312 { 312 {
313 HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia ::from(element); 313 HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia ::from(element);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 406
407 WebContentDecryptionModule* HTMLMediaElementEncryptedMedia::contentDecryptionMod ule() 407 WebContentDecryptionModule* HTMLMediaElementEncryptedMedia::contentDecryptionMod ule()
408 { 408 {
409 return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0; 409 return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0;
410 } 410 }
411 411
412 DEFINE_TRACE(HTMLMediaElementEncryptedMedia) 412 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
413 { 413 {
414 visitor->trace(m_mediaElement); 414 visitor->trace(m_mediaElement);
415 visitor->trace(m_mediaKeys); 415 visitor->trace(m_mediaKeys);
416 HeapSupplement<HTMLMediaElement>::trace(visitor); 416 Supplement<HTMLMediaElement>::trace(visitor);
417 } 417 }
418 418
419 } // namespace blink 419 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698