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

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

Issue 2856173004: Clean up bindings/core/v8 (Part 5) (Closed)
Patch Set: Fix build Created 3 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
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/encryptedmedia/MediaKeys.h" 26 #include "modules/encryptedmedia/MediaKeys.h"
27 27
28 #include <memory> 28 #include <memory>
29 #include "bindings/core/v8/ScriptPromise.h" 29 #include "bindings/core/v8/ScriptPromise.h"
30 #include "bindings/core/v8/V8ThrowException.h"
31 #include "core/dom/DOMArrayBuffer.h" 30 #include "core/dom/DOMArrayBuffer.h"
32 #include "core/dom/DOMException.h" 31 #include "core/dom/DOMException.h"
33 #include "core/dom/ExceptionCode.h" 32 #include "core/dom/ExceptionCode.h"
34 #include "core/dom/ExecutionContext.h" 33 #include "core/dom/ExecutionContext.h"
35 #include "core/dom/TaskRunnerHelper.h" 34 #include "core/dom/TaskRunnerHelper.h"
36 #include "core/html/HTMLMediaElement.h" 35 #include "core/html/HTMLMediaElement.h"
37 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h" 36 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
38 #include "modules/encryptedmedia/EncryptedMediaUtils.h" 37 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
39 #include "modules/encryptedmedia/MediaKeySession.h" 38 #include "modules/encryptedmedia/MediaKeySession.h"
40 #include "platform/InstanceCounters.h" 39 #include "platform/InstanceCounters.h"
41 #include "platform/Timer.h" 40 #include "platform/Timer.h"
42 #include "platform/bindings/ScriptState.h" 41 #include "platform/bindings/ScriptState.h"
42 #include "platform/bindings/V8ThrowException.h"
43 #include "platform/wtf/RefPtr.h" 43 #include "platform/wtf/RefPtr.h"
44 #include "public/platform/WebContentDecryptionModule.h" 44 #include "public/platform/WebContentDecryptionModule.h"
45 45
46 #define MEDIA_KEYS_LOG_LEVEL 3 46 #define MEDIA_KEYS_LOG_LEVEL 3
47 47
48 namespace blink { 48 namespace blink {
49 49
50 // A class holding a pending action. 50 // A class holding a pending action.
51 class MediaKeys::PendingAction final 51 class MediaKeys::PendingAction final
52 : public GarbageCollected<MediaKeys::PendingAction> { 52 : public GarbageCollected<MediaKeys::PendingAction> {
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 // Remain around if there are pending events. 313 // Remain around if there are pending events.
314 DVLOG(MEDIA_KEYS_LOG_LEVEL) 314 DVLOG(MEDIA_KEYS_LOG_LEVEL)
315 << __func__ << "(" << this << ")" 315 << __func__ << "(" << this << ")"
316 << (!pending_actions_.IsEmpty() ? " !m_pendingActions.isEmpty()" : "") 316 << (!pending_actions_.IsEmpty() ? " !m_pendingActions.isEmpty()" : "")
317 << (reserved_for_media_element_ ? " m_reservedForMediaElement" : ""); 317 << (reserved_for_media_element_ ? " m_reservedForMediaElement" : "");
318 318
319 return !pending_actions_.IsEmpty() || reserved_for_media_element_; 319 return !pending_actions_.IsEmpty() || reserved_for_media_element_;
320 } 320 }
321 321
322 } // namespace blink 322 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698