Oilpan: Remove OffHeapCollectionTrait

Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 19 matching lines @@
 namespace {
 
 static WebVector<WebEncryptedMediaInitDataType> convertInitDataTypes(const Vector<String>& initDataTypes)
 {
     WebVector<WebEncryptedMediaInitDataType> result(initDataTypes.size());
     for (size_t i = 0; i < initDataTypes.size(); ++i)
         result[i] = EncryptedMediaUtils::convertToInitDataType(initDataTypes[i]);
     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) {
         const WebString& contentType = capabilities[i].contentType();
         result[i].contentType = contentType;
         if (isValidContentType(contentType)) {
             // FIXME: Fail if there are unrecognized parameters.
             ParsedContentType type(capabilities[i].contentType());
             result[i].mimeType = type.mimeType();
             result[i].codecs = type.parameterValueForName("codecs");
@@ skipping 24 matching lines @@
         result[i] = EncryptedMediaUtils::convertToSessionType(sessionTypes[i]);
     return result;
 }
 
 // This class allows capabilities to be checked and a MediaKeySystemAccess
 // object to be created asynchronously.
 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.
     virtual WebString keySystem() const override { return m_keySystem; }
     virtual const WebVector<WebMediaKeySystemConfiguration>& supportedConfigurations() const override { return m_supportedConfigurations; }
     virtual SecurityOrigin* securityOrigin() const override { return m_resolver->executionContext()->securityOrigin(); }
     virtual void requestSucceeded(WebContentDecryptionModuleAccess*) override;
     virtual void requestNotSupported(const WebString& errorMessage) override;
 
     ScriptPromise promise() { return m_resolver->promise(); }
 
 private:
     RefPtr<ScriptPromiseResolver> m_resolver;
     const String m_keySystem;
     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())
 {
     for (size_t i = 0; i < supportedConfigurations.size(); ++i) {
         const MediaKeySystemConfiguration& config = supportedConfigurations[i];
         WebMediaKeySystemConfiguration webConfig;
         if (config.hasInitDataTypes()) {
             webConfig.hasInitDataTypes = true;
             webConfig.initDataTypes = convertInitDataTypes(config.initDataTypes());
@@ skipping 31 matching lines @@
     m_resolver->reject(DOMException::create(NotSupportedError, errorMessage));
     m_resolver.clear();
 }
 
 } // namespace
 
 ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
     ScriptState* scriptState,
     Navigator& navigator,
     const String& keySystem,
-    const Vector<MediaKeySystemConfiguration>& supportedConfigurations)
+    const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
 {
     WTF_LOG(Media, "NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess()");
 
     // From https://w3c.github.io/encrypted-media/#requestMediaKeySystemAccess
     // When this method is invoked, the user agent must run the following steps:
     // 1. If keySystem is an empty string, return a promise rejected with a
     //    new DOMException whose name is InvalidAccessError.
     if (keySystem.isEmpty()) {
         return ScriptPromise::rejectWithDOMException(
             scriptState, DOMException::create(InvalidAccessError, "The keySystem parameter is empty."));
@@ skipping 27 matching lines @@
     //    initialize the MediaKeySystemAccess object.
     MediaKeysController* controller = MediaKeysController::from(document->page());
     WebEncryptedMediaClient* mediaClient = controller->encryptedMediaClient(scriptState->executionContext());
     mediaClient->requestMediaKeySystemAccess(WebEncryptedMediaRequest(initializer));
 
     // 8. Return promise.
     return promise;
 }
 
 } // namespace blink