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

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

Issue 2801083003: Rewrite references to "wtf/" to "platform/wtf/" in modules. (Closed)
Patch Set: Rebase again^3. Will try landing directly. Created 3 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/NavigatorRequestMediaKeySystemAccess.h" 5 #include "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
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 "bindings/core/v8/V8ThrowException.h" 12 #include "bindings/core/v8/V8ThrowException.h"
13 #include "core/dom/DOMException.h" 13 #include "core/dom/DOMException.h"
14 #include "core/dom/Document.h" 14 #include "core/dom/Document.h"
15 #include "core/dom/ExceptionCode.h" 15 #include "core/dom/ExceptionCode.h"
16 #include "core/frame/Deprecation.h" 16 #include "core/frame/Deprecation.h"
17 #include "core/frame/Settings.h" 17 #include "core/frame/Settings.h"
18 #include "core/inspector/ConsoleMessage.h" 18 #include "core/inspector/ConsoleMessage.h"
19 #include "modules/encryptedmedia/EncryptedMediaUtils.h" 19 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
20 #include "modules/encryptedmedia/MediaKeySession.h" 20 #include "modules/encryptedmedia/MediaKeySession.h"
21 #include "modules/encryptedmedia/MediaKeySystemAccess.h" 21 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
22 #include "modules/encryptedmedia/MediaKeysController.h" 22 #include "modules/encryptedmedia/MediaKeysController.h"
23 #include "platform/EncryptedMediaRequest.h" 23 #include "platform/EncryptedMediaRequest.h"
24 #include "platform/Histogram.h" 24 #include "platform/Histogram.h"
25 #include "platform/network/ParsedContentType.h" 25 #include "platform/network/ParsedContentType.h"
26 #include "platform/network/mime/ContentType.h" 26 #include "platform/network/mime/ContentType.h"
27 #include "platform/wtf/PtrUtil.h"
28 #include "platform/wtf/Vector.h"
29 #include "platform/wtf/text/WTFString.h"
27 #include "public/platform/WebEncryptedMediaClient.h" 30 #include "public/platform/WebEncryptedMediaClient.h"
28 #include "public/platform/WebEncryptedMediaRequest.h" 31 #include "public/platform/WebEncryptedMediaRequest.h"
29 #include "public/platform/WebMediaKeySystemConfiguration.h" 32 #include "public/platform/WebMediaKeySystemConfiguration.h"
30 #include "public/platform/WebMediaKeySystemMediaCapability.h" 33 #include "public/platform/WebMediaKeySystemMediaCapability.h"
31 #include "public/platform/WebVector.h" 34 #include "public/platform/WebVector.h"
32 #include "wtf/PtrUtil.h"
33 #include "wtf/Vector.h"
34 #include "wtf/text/WTFString.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 namespace { 38 namespace {
39 39
40 static WebVector<WebEncryptedMediaInitDataType> ConvertInitDataTypes( 40 static WebVector<WebEncryptedMediaInitDataType> ConvertInitDataTypes(
41 const Vector<String>& init_data_types) { 41 const Vector<String>& init_data_types) {
42 WebVector<WebEncryptedMediaInitDataType> result(init_data_types.size()); 42 WebVector<WebEncryptedMediaInitDataType> result(init_data_types.size());
43 for (size_t i = 0; i < init_data_types.size(); ++i) 43 for (size_t i = 0; i < init_data_types.size(); ++i)
44 result[i] = EncryptedMediaUtils::ConvertToInitDataType(init_data_types[i]); 44 result[i] = EncryptedMediaUtils::ConvertToInitDataType(init_data_types[i]);
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 WebEncryptedMediaClient* media_client = 332 WebEncryptedMediaClient* media_client =
333 controller->EncryptedMediaClient(execution_context); 333 controller->EncryptedMediaClient(execution_context);
334 media_client->RequestMediaKeySystemAccess( 334 media_client->RequestMediaKeySystemAccess(
335 WebEncryptedMediaRequest(initializer)); 335 WebEncryptedMediaRequest(initializer));
336 336
337 // 7. Return promise. 337 // 7. Return promise.
338 return promise; 338 return promise;
339 } 339 }
340 340
341 } // namespace blink 341 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698