Add PpapiDecryptor which wraps a CDM plugin.

webkit/media/webmediaplayer_impl.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/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "v8/include/v8.h"
 #include "webkit/media/buffered_data_source.h"
 #include "webkit/media/filter_helpers.h"
 #include "webkit/media/webmediaplayer_delegate.h"
 #include "webkit/media/webmediaplayer_proxy.h"
 #include "webkit/media/webmediaplayer_util.h"
 #include "webkit/media/webvideoframe_impl.h"
+#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebString;
 using media::PipelineStatus;
 
 namespace {
 
@@ skipping 72 matching lines @@
       pending_seek_seconds_(0.0f),
       client_(client),
       proxy_(new WebMediaPlayerProxy(main_loop_->message_loop_proxy(), this)),
       delegate_(delegate),
       media_stream_client_(media_stream_client),
       media_log_(media_log),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
       audio_source_provider_(audio_source_provider),
       is_local_source_(false),
-      decryptor_(proxy_.get()) {
+      decryptor_(proxy_.get(),
+                 base::Bind(&WebMediaPlayerImpl::CreatePluginInstance,
+                            base::Unretained(this))) {

[xhwang, 2012/07/17 00:57:23]

This "Unretained" is ugly but should work. The callback passed in here will only
be called by the PpapiDecrypor which is owned by the ProxyDecryptor, which is
then owned by WMPI. If WMPI is destroyed, PpapiDecryptor should also be
destroyed and will not call this callback.

Even so, I'll think about better ways to do this. Please let me know about your
ideas.

   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
   MessageLoop* pipeline_message_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
   pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_);
 
   // Let V8 know we started new thread if we did not did it yet.
   // Made separate task to avoid deletion of player currently being created.
   // Also, delaying GC until after player starts gets rid of starting lag --
@@ skipping 893 matching lines @@
     proxy_ = NULL;
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   DCHECK(client_);
   return client_;
 }
 
+scoped_refptr<webkit::ppapi::PluginInstance>
+    WebMediaPlayerImpl::CreatePluginInstance(const std::string& plugin_type) {

[xhwang, 2012/07/17 00:57:23]

We can replace this function with something like 
base::Bind(WebMediaPlayerClient::createHelperPlugin, GetClient(), frame_). The
only problem is that this requires we change the order of parameters of
createHelperPlugin.

[ddorwin, 2012/07/17 21:31:28]

If we replaced it, where would the checks and casting below go?

[xhwang, 2012/07/18 19:43:17]

All of these are done in PpapiDecryptor::Init() now.

+  WebKit::WebPlugin* plugin = GetClient()->createHelperPlugin(
+      WebString::fromUTF8(plugin_type), frame_);
+  DCHECK(!plugin->isPlaceholder());  // Prevented by WebKit.
+  // Only Pepper plugins are supported, so it must be a ppapi object.
+  webkit::ppapi::WebPluginImpl* ppapi_plugin =
+      static_cast<webkit::ppapi::WebPluginImpl*>(plugin);
+  return scoped_refptr<webkit::ppapi::PluginInstance>(ppapi_plugin->instance());
+}
+
 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() {
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media