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

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

Issue 2799563002: Replace usage of WebVector::isEmpty with WebVector::empty().
Patch Set: 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/MediaKeySystemAccess.h" 5 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 : m_keySystem(keySystem), m_access(std::move(access)) {} 115 : m_keySystem(keySystem), m_access(std::move(access)) {}
116 116
117 MediaKeySystemAccess::~MediaKeySystemAccess() {} 117 MediaKeySystemAccess::~MediaKeySystemAccess() {}
118 118
119 void MediaKeySystemAccess::getConfiguration( 119 void MediaKeySystemAccess::getConfiguration(
120 MediaKeySystemConfiguration& result) { 120 MediaKeySystemConfiguration& result) {
121 WebMediaKeySystemConfiguration configuration = m_access->getConfiguration(); 121 WebMediaKeySystemConfiguration configuration = m_access->getConfiguration();
122 122
123 // |initDataTypes|, |audioCapabilities|, and |videoCapabilities| can only be 123 // |initDataTypes|, |audioCapabilities|, and |videoCapabilities| can only be
124 // empty if they were not present in the requested configuration. 124 // empty if they were not present in the requested configuration.
125 if (!configuration.initDataTypes.isEmpty()) 125 if (!configuration.initDataTypes.empty())
126 result.setInitDataTypes(convertInitDataTypes(configuration.initDataTypes)); 126 result.setInitDataTypes(convertInitDataTypes(configuration.initDataTypes));
127 if (!configuration.audioCapabilities.isEmpty()) 127 if (!configuration.audioCapabilities.empty())
128 result.setAudioCapabilities( 128 result.setAudioCapabilities(
129 convertCapabilities(configuration.audioCapabilities)); 129 convertCapabilities(configuration.audioCapabilities));
130 if (!configuration.videoCapabilities.isEmpty()) 130 if (!configuration.videoCapabilities.empty())
131 result.setVideoCapabilities( 131 result.setVideoCapabilities(
132 convertCapabilities(configuration.videoCapabilities)); 132 convertCapabilities(configuration.videoCapabilities));
133 133
134 // |distinctiveIdentifier|, |persistentState|, and |sessionTypes| are always 134 // |distinctiveIdentifier|, |persistentState|, and |sessionTypes| are always
135 // set by requestMediaKeySystemAccess(). 135 // set by requestMediaKeySystemAccess().
136 result.setDistinctiveIdentifier( 136 result.setDistinctiveIdentifier(
137 convertMediaKeysRequirement(configuration.distinctiveIdentifier)); 137 convertMediaKeysRequirement(configuration.distinctiveIdentifier));
138 result.setPersistentState( 138 result.setPersistentState(
139 convertMediaKeysRequirement(configuration.persistentState)); 139 convertMediaKeysRequirement(configuration.persistentState));
140 result.setSessionTypes(convertSessionTypes(configuration.sessionTypes)); 140 result.setSessionTypes(convertSessionTypes(configuration.sessionTypes));
(...skipping 23 matching lines...) Expand all
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
« no previous file with comments | « third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | third_party/WebKit/Source/platform/WebVectorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698