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

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

Issue 687533004: Simplify use of ContentDecryptionModuleResult with promises (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 "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"
11 #include "bindings/core/v8/ScriptState.h" 11 #include "bindings/core/v8/ScriptState.h"
12 #include "core/dom/DOMException.h" 12 #include "core/dom/DOMException.h"
13 #include "core/dom/DOMTypedArray.h" 13 #include "core/dom/DOMTypedArray.h"
14 #include "core/dom/ExceptionCode.h" 14 #include "core/dom/ExceptionCode.h"
15 #include "core/html/HTMLMediaElement.h" 15 #include "core/html/HTMLMediaElement.h"
16 #include "core/html/MediaKeyError.h" 16 #include "core/html/MediaKeyError.h"
17 #include "core/html/MediaKeyEvent.h" 17 #include "core/html/MediaKeyEvent.h"
18 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
18 #include "modules/encryptedmedia/MediaEncryptedEvent.h" 19 #include "modules/encryptedmedia/MediaEncryptedEvent.h"
19 #include "modules/encryptedmedia/MediaKeys.h" 20 #include "modules/encryptedmedia/MediaKeys.h"
20 #include "modules/encryptedmedia/SimpleContentDecryptionModuleResult.h"
21 #include "platform/ContentDecryptionModuleResult.h" 21 #include "platform/ContentDecryptionModuleResult.h"
22 #include "platform/Logging.h" 22 #include "platform/Logging.h"
23 #include "platform/RuntimeEnabledFeatures.h" 23 #include "platform/RuntimeEnabledFeatures.h"
24 #include "wtf/Functional.h" 24 #include "wtf/Functional.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 static void throwExceptionIfMediaKeyExceptionOccurred(const String& keySystem, c onst String& sessionId, WebMediaPlayer::MediaKeyException exception, ExceptionSt ate& exceptionState) 28 static void throwExceptionIfMediaKeyExceptionOccurred(const String& keySystem, c onst String& sessionId, WebMediaPlayer::MediaKeyException exception, ExceptionSt ate& exceptionState)
29 { 29 {
30 switch (exception) { 30 switch (exception) {
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 return thisElement.contentDecryptionModule(); 542 return thisElement.contentDecryptionModule();
543 } 543 }
544 544
545 void HTMLMediaElementEncryptedMedia::trace(Visitor* visitor) 545 void HTMLMediaElementEncryptedMedia::trace(Visitor* visitor)
546 { 546 {
547 visitor->trace(m_mediaKeys); 547 visitor->trace(m_mediaKeys);
548 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); 548 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
549 } 549 }
550 550
551 } // namespace blink 551 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698