Add PpapiDecryptor which wraps a CDM plugin.

webkit/media/crypto/proxy_decryptor.cc

 // Copyright (c) 2012 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 "webkit/media/crypto/proxy_decryptor.h"
 
 #include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/key_systems.h"
+#include "webkit/media/crypto/ppapi_decryptor.h"
 
 namespace webkit_media {
 
-ProxyDecryptor::ProxyDecryptor(media::DecryptorClient* client)
-    : client_(client) {
+ProxyDecryptor::ProxyDecryptor(
+    media::DecryptorClient* decryptor_client,
+    WebKit::WebMediaPlayerClient* web_media_player_client,
+    WebKit::WebFrame* web_frame)
+    : client_(decryptor_client),
+      web_media_player_client_(web_media_player_client),
+      web_frame_(web_frame) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
 }
 
 void ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
                                         const uint8* init_data,
                                         int init_data_length) {
   // We do not support run-time switching of decryptors. GenerateKeyRequest()
   // only creates a new decryptor when |decryptor_| is not initialized.
   if (!decryptor_.get()) {
     base::AutoLock auto_lock(lock_);
-    decryptor_ = CreateDecryptor(key_system, client_);
+    decryptor_ = CreateDecryptor(key_system);
   }
 
-  DCHECK(decryptor_.get());
+  DCHECK(client_);
+  if (!decryptor_.get()) {
+    // TODO(ddorwin): Update the spec about generateKeyRequest to include an
+    // error for handler loading failure. In our case, this can happen when the
+    // plugin cannot be loaded.
+    client_->KeyError(key_system, "", Decryptor::kUnknownError, 0);
+    return;
+  }
+
   decryptor_->GenerateKeyRequest(key_system, init_data, init_data_length);
 }
 
 void ProxyDecryptor::AddKey(const std::string& key_system,
                             const uint8* key,
                             int key_length,
                             const uint8* init_data,
                             int init_data_length,
                             const std::string& session_id) {
   // WebMediaPlayerImpl ensures GenerateKeyRequest() has been called.
@@ skipping 17 matching lines @@
   {
     base::AutoLock auto_lock(lock_);
     decryptor = decryptor_.get();
   }
   if (!decryptor)
     decrypt_cb.Run(kError, NULL);
 
   return decryptor->Decrypt(encrypted, decrypt_cb);
 }
 
+scoped_ptr<media::Decryptor> ProxyDecryptor::CreateDecryptor(
+    const std::string& key_system) {
+  DCHECK(client_);
+  DCHECK(web_media_player_client_);
+  DCHECK(web_frame_);
+
+  if (CanUseAesDecryptor(key_system))
+    return scoped_ptr<media::Decryptor>(new media::AesDecryptor(client_));
+
+  // For now, we only support AesDecryptor and PpapiDecryptor. So if we cannot

[ddorwin, 2012/07/19 01:12:34]

You can remove "For now, ".

[xhwang, 2012/07/19 15:54:34]

Done.

+  // use the AesDecryptor, then we'll try to create a PpapiDecryptor for given
+  // |key_system|.
+  scoped_ptr<PpapiDecryptor> ppapi_decryptor(new PpapiDecryptor(client_));
+  if (ppapi_decryptor->Init(key_system, web_media_player_client_, web_frame_))

[ddorwin, 2012/07/19 01:12:34]

Since we are creating and initializing a PpapiDecryptor here. We could just call
CreateHelperPlugin() here and pass the result to the PpapiDecryptor constructor.
That would separate the latter from WMPI more. You could do all the
initialization such that only a webkit::ppapi::PluginInstance needs to be passed
in. (I would do the work to get there in a private method rather than here.

[xhwang, 2012/07/19 15:54:34]

Done.

+    return scoped_ptr<media::Decryptor>(ppapi_decryptor.release());
+
+  return scoped_ptr<media::Decryptor>();
+}
+
 }  // namespace webkit_media