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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/NavigatorRequestMediaKeySystemAccess.h" 5 #include "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
6 6
7 #include "bindings/core/v8/ScriptPromise.h" 7 #include "bindings/core/v8/ScriptPromise.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
10 #include "bindings/core/v8/V8ThrowException.h" 10 #include "bindings/core/v8/V8ThrowException.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 void MediaKeySystemAccessInitializer::requestSucceeded( 202 void MediaKeySystemAccessInitializer::requestSucceeded(
203 WebContentDecryptionModuleAccess* access) { 203 WebContentDecryptionModuleAccess* access) {
204 checkEmptyCodecs(access->getConfiguration()); 204 checkEmptyCodecs(access->getConfiguration());
205 checkCapabilities(access->getConfiguration()); 205 checkCapabilities(access->getConfiguration());
206 206
207 if (!isExecutionContextValid()) 207 if (!isExecutionContextValid())
208 return; 208 return;
209 209
210 m_resolver->resolve( 210 m_resolver->resolve(
211 new MediaKeySystemAccess(m_keySystem, wrapUnique(access))); 211 new MediaKeySystemAccess(m_keySystem, WTF::wrapUnique(access)));
212 m_resolver.clear(); 212 m_resolver.clear();
213 } 213 }
214 214
215 void MediaKeySystemAccessInitializer::requestNotSupported( 215 void MediaKeySystemAccessInitializer::requestNotSupported(
216 const WebString& errorMessage) { 216 const WebString& errorMessage) {
217 if (!isExecutionContextValid()) 217 if (!isExecutionContextValid())
218 return; 218 return;
219 219
220 m_resolver->reject(DOMException::create(NotSupportedError, errorMessage)); 220 m_resolver->reject(DOMException::create(NotSupportedError, errorMessage));
221 m_resolver.clear(); 221 m_resolver.clear();
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 WebEncryptedMediaClient* mediaClient = 390 WebEncryptedMediaClient* mediaClient =
391 controller->encryptedMediaClient(executionContext); 391 controller->encryptedMediaClient(executionContext);
392 mediaClient->requestMediaKeySystemAccess( 392 mediaClient->requestMediaKeySystemAccess(
393 WebEncryptedMediaRequest(initializer)); 393 WebEncryptedMediaRequest(initializer));
394 394
395 // 7. Return promise. 395 // 7. Return promise.
396 return promise; 396 return promise;
397 } 397 }
398 398
399 } // namespace blink 399 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698