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

Unified Diff: Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

Issue 1112363003: Oilpan: Remove OffHeapCollectionTrait (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
diff --git a/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp b/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
index 1d4cb8fc6599bfb0edecc7f4335a5121c2addbd3..19ccc9615b9c347f5c9d31e84df8b96570543d50 100644
--- a/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
+++ b/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
@@ -37,7 +37,7 @@ static WebVector<WebEncryptedMediaInitDataType> convertInitDataTypes(const Vecto
return result;
}
-static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities(const Vector<MediaKeySystemMediaCapability>& capabilities)
+static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities(const HeapVector<MediaKeySystemMediaCapability>& capabilities)
{
WebVector<WebMediaKeySystemMediaCapability> result(capabilities.size());
for (size_t i = 0; i < capabilities.size(); ++i) {
@@ -82,7 +82,7 @@ class MediaKeySystemAccessInitializer final : public EncryptedMediaRequest {
WTF_MAKE_NONCOPYABLE(MediaKeySystemAccessInitializer);
public:
- MediaKeySystemAccessInitializer(ScriptState*, const String& keySystem, const Vector<MediaKeySystemConfiguration>& supportedConfigurations);
+ MediaKeySystemAccessInitializer(ScriptState*, const String& keySystem, const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations);
virtual ~MediaKeySystemAccessInitializer() { }
// EncryptedMediaRequest implementation.
@@ -100,7 +100,7 @@ private:
WebVector<WebMediaKeySystemConfiguration> m_supportedConfigurations;
};
-MediaKeySystemAccessInitializer::MediaKeySystemAccessInitializer(ScriptState* scriptState, const String& keySystem, const Vector<MediaKeySystemConfiguration>& supportedConfigurations)
+MediaKeySystemAccessInitializer::MediaKeySystemAccessInitializer(ScriptState* scriptState, const String& keySystem, const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
: m_resolver(ScriptPromiseResolver::create(scriptState))
, m_keySystem(keySystem)
, m_supportedConfigurations(supportedConfigurations.size())
@@ -152,7 +152,7 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
ScriptState* scriptState,
Navigator& navigator,
const String& keySystem,
- const Vector<MediaKeySystemConfiguration>& supportedConfigurations)
+ const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
{
WTF_LOG(Media, "NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess()");
« no previous file with comments | « Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h ('k') | Source/platform/heap/HeapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698