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

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

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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/MediaKeySystemAccess.h" 5 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
6 6
7 #include <memory>
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
9 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
10 #include "core/dom/Document.h" 11 #include "core/dom/Document.h"
11 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h" 12 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
12 #include "modules/encryptedmedia/EncryptedMediaUtils.h" 13 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
13 #include "modules/encryptedmedia/MediaKeySession.h" 14 #include "modules/encryptedmedia/MediaKeySession.h"
14 #include "modules/encryptedmedia/MediaKeys.h" 15 #include "modules/encryptedmedia/MediaKeys.h"
15 #include "modules/encryptedmedia/MediaKeysController.h" 16 #include "modules/encryptedmedia/MediaKeysController.h"
16 #include "platform/Timer.h" 17 #include "platform/Timer.h"
17 #include "public/platform/WebContentDecryptionModule.h" 18 #include "public/platform/WebContentDecryptionModule.h"
18 #include "public/platform/WebEncryptedMediaTypes.h" 19 #include "public/platform/WebEncryptedMediaTypes.h"
19 #include "public/platform/WebMediaKeySystemConfiguration.h" 20 #include "public/platform/WebMediaKeySystemConfiguration.h"
20 #include "wtf/PtrUtil.h" 21 #include "wtf/PtrUtil.h"
21 #include <memory>
22 22
23 namespace blink { 23 namespace blink {
24 24
25 namespace { 25 namespace {
26 26
27 // This class wraps the promise resolver used when creating MediaKeys 27 // This class wraps the promise resolver used when creating MediaKeys
28 // and is passed to Chromium to fullfill the promise. This implementation of 28 // and is passed to Chromium to fullfill the promise. This implementation of
29 // completeWithCdm() will resolve the promise with a new MediaKeys object, 29 // completeWithCdm() will resolve the promise with a new MediaKeys object,
30 // while completeWithError() will reject the promise with an exception. 30 // while completeWithError() will reject the promise with an exception.
31 // All other complete methods are not expected to be called, and will 31 // All other complete methods are not expected to be called, and will
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // (Done if completeWithException() called). 164 // (Done if completeWithException() called).
165 m_access->createContentDecryptionModule(helper->result()); 165 m_access->createContentDecryptionModule(helper->result());
166 166
167 // 3. Return promise. 167 // 3. Return promise.
168 return promise; 168 return promise;
169 } 169 }
170 170
171 DEFINE_TRACE(MediaKeySystemAccess) {} 171 DEFINE_TRACE(MediaKeySystemAccess) {}
172 172
173 } // namespace blink 173 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698