Handle createCDM() when frame destroyed

media/blink/webencryptedmediaclient_impl.cc

 // 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 "webencryptedmediaclient_impl.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/key_systems.h"
 #include "media/base/media_permission.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebEncryptedMediaRequest.h"
 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
+#include "webcontentdecryptionmodule_impl.h"
 #include "webcontentdecryptionmoduleaccess_impl.h"
 
 namespace media {
 
 // These names are used by UMA.
 const char kKeySystemSupportUMAPrefix[] =
     "Media.EME.RequestMediaKeySystemAccess.";
 
 static bool IsSupportedContentType(
     const std::string& key_system,
@@ skipping 154 matching lines @@
   }
 
   const std::string uma_name_;
   bool is_request_reported_;
   bool is_support_reported_;
 };
 
 WebEncryptedMediaClientImpl::WebEncryptedMediaClientImpl(
     scoped_ptr<CdmFactory> cdm_factory,
     MediaPermission* media_permission)
-    : cdm_factory_(cdm_factory.Pass()) {
+    : cdm_factory_(cdm_factory.Pass()), weak_factory_(this) {
   // TODO(sandersd): Use |media_permission| to check for media permissions in
   // this class.
   DCHECK(media_permission);
 }
 
 WebEncryptedMediaClientImpl::~WebEncryptedMediaClientImpl() {
 }
 
 void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
     blink::WebEncryptedMediaRequest request) {
@@ skipping 27 matching lines @@
   //     and abort these steps.
   const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
       configurations = request.supportedConfigurations();
 
   // TODO(sandersd): Remove once Blink requires the configurations parameter for
   // requestMediaKeySystemAccess().
   if (configurations.isEmpty()) {
     reporter->ReportSupported();
     request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
         request.keySystem(), blink::WebMediaKeySystemConfiguration(),
-        request.securityOrigin(), cdm_factory_.get()));
+        request.securityOrigin(), weak_factory_.GetWeakPtr()));
     return;
   }
 
   for (size_t i = 0; i < configurations.size(); i++) {
     const blink::WebMediaKeySystemConfiguration& candidate = configurations[i];
     blink::WebMediaKeySystemConfiguration accumulated_configuration;
     if (GetSupportedConfiguration(key_system, candidate,
                                   request.securityOrigin(),
                                   &accumulated_configuration)) {
       reporter->ReportSupported();
       request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
           request.keySystem(), accumulated_configuration,
-          request.securityOrigin(), cdm_factory_.get()));
+          request.securityOrigin(), weak_factory_.GetWeakPtr()));
       return;
     }
   }
 
   // 7.4 Reject promise with a new DOMException whose name is NotSupportedError.
   request.requestNotSupported(
       "None of the requested configurations were supported.");
 }
 
+void WebEncryptedMediaClientImpl::CreateCdm(
+    blink::WebSecurityOrigin security_origin,
+    blink::WebString key_system,
+    blink::WebContentDecryptionModuleResult result) {
+  WebContentDecryptionModuleImpl::Create(cdm_factory_.get(), security_origin,
+                                         key_system, result);
+}
+
 // Lazily create Reporters.
 WebEncryptedMediaClientImpl::Reporter* WebEncryptedMediaClientImpl::GetReporter(
     const std::string& key_system) {
   std::string uma_name = GetKeySystemNameForUMA(key_system);
   Reporter* reporter = reporters_.get(uma_name);
   if (reporter != nullptr)
     return reporter;
 
   // Reporter not found, so create one.
   auto result =
       reporters_.add(uma_name, make_scoped_ptr(new Reporter(uma_name)));
   DCHECK(result.second);
   return result.first->second;
 }
 
 }  // namespace media