Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc |
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
index ecc4369c4f73f7607951bfa971535cbbce431e5f..74b5c76c69f049fa228ab8257a8a694a9020e1f9 100644 |
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
@@ -114,6 +114,7 @@ using ppapi::thunk::PPB_Graphics2D_API; |
using ppapi::thunk::PPB_Graphics3D_API; |
using ppapi::thunk::PPB_ImageData_API; |
using ppapi::Var; |
+using ppapi::ArrayBufferVar; |
using ppapi::ViewData; |
using WebKit::WebBindings; |
using WebKit::WebCanvas; |
@@ -294,6 +295,34 @@ scoped_array<const char*> StringVectorToArgArray( |
return array.Pass(); |
} |
+// Creates a PP_Resource containing a PPB_Buffer_Impl, copies |data| into the |
+// buffer resource, and returns it. Returns a PP_Resource equal to 0 on |
+// failure. |
+PP_Resource MakeBufferResource(PP_Instance instance, |
+ const std::string& data) { |
+ if (data.empty()) |
+ return 0; |
+ |
+ ScopedPPResource resource(PPB_Buffer_Impl::Create(instance, data.size())); |
+ if (!resource.get()) |
+ return 0; |
+ |
+ EnterResourceNoLock<PPB_Buffer_API> enter(resource, true); |
+ if (enter.failed()) |
+ return 0; |
+ |
+ BufferAutoMapper mapper(enter.object()); |
+ if (!mapper.data() || mapper.size() < data.size()) |
+ return 0; |
+ memcpy(mapper.data(), data.data(), data.size()); |
+ |
+ // Add the resource to the tracker... |
+ // TODO(tomfinegan): wild guess/no idea if this is right. |
+ PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(resource.get()); |
+ |
+ return resource.Release(); |
+} |
+ |
} // namespace |
// static |
@@ -323,6 +352,7 @@ PluginInstance::PluginInstance( |
has_webkit_focus_(false), |
has_content_area_focus_(false), |
find_identifier_(-1), |
+ plugin_decryption_interface_(NULL), |
plugin_find_interface_(NULL), |
plugin_input_event_interface_(NULL), |
plugin_messaging_interface_(NULL), |
@@ -959,6 +989,16 @@ void PluginInstance::StopFind() { |
plugin_find_interface_->StopFind(pp_instance()); |
} |
+bool PluginInstance::LoadContentDecryptionModuleInterface() { |
+ if (!plugin_decryption_interface_) { |
+ plugin_decryption_interface_ = |
+ static_cast<const PPP_ContentDecryptor_Dev*>( |
+ module_->GetPluginInterface( |
+ PPP_CONTENTDECRYPTOR_DEV_INTERFACE)); |
+ } |
+ return !!plugin_decryption_interface_; |
+} |
+ |
bool PluginInstance::LoadFindInterface() { |
if (!plugin_find_interface_) { |
plugin_find_interface_ = |
@@ -1276,6 +1316,99 @@ void PluginInstance::RotateView(WebPlugin::RotationType type) { |
// NOTE: plugin instance may have been deleted. |
} |
+bool PluginInstance::GenerateKeyRequest(const std::string& key_system, |
+ const std::string& init_data) { |
+ if (!LoadContentDecryptionModuleInterface()) |
+ return false; |
+ |
+ if (key_system.empty()) |
+ return false; |
+ |
+ PP_Resource init_data_resource = 0; |
+ if (init_data.size()) { |
+ ScopedPPResource local_init_data(ScopedPPResource::PassRef(), |
+ MakeBufferResource(pp_instance(), |
+ init_data)); |
+ |
+ if (!local_init_data.get()) |
+ return false; |
+ init_data_resource = local_init_data.Release(); |
+ } |
+ |
+ PP_Var init_data_array = |
+ PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( |
+ init_data.size(), init_data.data()); |
+ |
+ return PP_ToBool(plugin_decryption_interface_->GenerateKeyRequest( |
+ pp_instance(), |
+ StringVar::StringToPPVar(key_system), |
+ init_data_array)); |
+} |
+ |
+bool PluginInstance::AddKey(const std::string& session_id, |
+ const std::string& key) { |
+ if (!LoadContentDecryptionModuleInterface()) |
+ return false; |
+ |
+ StringVar session_id_var(session_id); |
+ if (session_id_var.value().size() < session_id.size()) |
+ return false; |
+ |
+ PP_Var key_array = |
+ PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(key.size(), |
+ key.data()); |
+ return PP_ToBool(plugin_decryption_interface_->AddKey( |
+ pp_instance(), |
+ session_id_var.GetPPVar(), |
+ key_array)); |
+} |
+ |
+bool PluginInstance::CancelKeyRequest(const std::string& session_id) { |
+ if (!LoadContentDecryptionModuleInterface()) |
+ return false; |
+ StringVar session_id_var(session_id); |
+ if (session_id_var.value().size() < session_id.size()) |
+ return false; |
+ return PP_ToBool(plugin_decryption_interface_->CancelKeyRequest( |
+ pp_instance(), |
+ session_id_var.GetPPVar())); |
+} |
+ |
+bool PluginInstance::Decrypt(const std::string& encrypted_block, |
xhwang
2012/08/01 18:55:38
Can we use base::StringPiece here and below, just
Tom Finegan
2012/08/02 01:12:04
Done.
|
+ const CDMStatusCB& callback) { |
+ if (!LoadContentDecryptionModuleInterface()) |
+ return false; |
+ ScopedPPResource encrypted_resource(ScopedPPResource::PassRef(), |
+ MakeBufferResource(pp_instance(), |
+ encrypted_block)); |
+ if (!encrypted_resource.get()) |
+ return false; |
+ // TODO(tomfinegan): wrap callback in PP_CompletionCallback and pass it to |
+ // the plugin. |
+ PP_CompletionCallback pp_callback = {NULL, NULL, 0}; |
+ return PP_ToBool(plugin_decryption_interface_->Decrypt(pp_instance(), |
+ encrypted_resource, |
+ pp_callback)); |
+} |
+ |
+bool PluginInstance::DecryptAndDecode(const std::string& encrypted_block, |
+ const CDMStatusCB& callback) { |
+ if (!LoadContentDecryptionModuleInterface()) |
+ return false; |
+ ScopedPPResource encrypted_resource(ScopedPPResource::PassRef(), |
+ MakeBufferResource(pp_instance(), |
+ encrypted_block)); |
+ if (!encrypted_resource.get()) |
+ return false; |
+ // TODO(tomfinegan): wrap callback in PP_CompletionCallback and pass it to |
+ // the plugin. |
+ PP_CompletionCallback pp_callback = {NULL, NULL, 0}; |
+ return PP_ToBool(plugin_decryption_interface_->DecryptAndDecode( |
+ pp_instance(), |
+ encrypted_resource, |
+ pp_callback)); |
+} |
+ |
bool PluginInstance::FlashIsFullscreenOrPending() { |
return fullscreen_container_ != NULL; |
} |
@@ -1879,6 +2012,113 @@ PP_Var PluginInstance::GetFontFamilies(PP_Instance instance) { |
return PP_MakeUndefined(); |
} |
+void PluginInstance::NeedKey(PP_Instance instance, |
+ PP_Var key_system_var, |
+ PP_Var session_id_var, |
+ PP_Var init_data_var) { |
+ StringVar* key_system_string = StringVar::FromPPVar(key_system_var); |
+ StringVar* session_id_string = StringVar::FromPPVar(session_id_var); |
+ StringVar* init_data_string = StringVar::FromPPVar(init_data_var); |
+ |
+ // TODO(tomfinegan): Where does the call to this method come from? Or, where |
+ // does it go for handling. I need to read more of the EME proposed spec, but |
+ // this is what I understand so far: |
+ // - JS app sends needkey before anything else when it knows that encrypted |
+ // data is going to be streamed to the user agent. |
+ // - OR is the media stack going to see something in the stream that looks |
+ // like init data, and then send NeedKey. If this is the case NeedKey |
+ // probably needs to move to the PPP interface. |
+ |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(key_system_var); |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(session_id_var); |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(init_data_var); |
+} |
+ |
+void PluginInstance::KeyAdded(PP_Instance instance, |
+ PP_Var key_system, |
+ PP_Var session_id) { |
+} |
+ |
+void PluginInstance::KeyMessage(PP_Instance instance, |
+ PP_Var key_system_var, |
+ PP_Var session_id_var, |
+ PP_Resource message_resource, |
+ PP_Var default_url_var) { |
+ StringVar* key_system_string = StringVar::FromPPVar(key_system_var); |
+ StringVar* session_id_string = StringVar::FromPPVar(session_id_var); |
+ StringVar* default_url_string = StringVar::FromPPVar(default_url_var); |
+ |
+ if (!key_system_string || !session_id_string || !default_url_string) { |
+ // TODO(tomfinegan): KeyError here? |
+ return; |
+ } |
+ |
+ EnterResourceNoLock<PPB_Buffer_API> enter(message_resource, true); |
+ if (enter.failed()) { |
+ // TODO(tomfinegan): KeyError here? |
+ NOTREACHED(); |
+ return; |
+ } |
+ |
+ BufferAutoMapper mapper(enter.object()); |
+ if (!mapper.data() || !mapper.size()) { |
+ // TODO(tomfinegan): KeyError here? |
+ NOTREACHED(); |
+ return; |
+ } |
+ |
+ std::string message(reinterpret_cast<char*>(mapper.data()), mapper.size()); |
+ if (message.empty()) { |
+ // TODO(tomfinegan): KeyError here? |
+ NOTREACHED(); |
+ return; |
+ } |
+ |
+ // Release the PP_Vars. |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(key_system_var); |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(session_id_var); |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(default_url_var); |
+ |
+ // Release the PP_Resource. |
+ // TODO(tomfinegan): Confirm that the buffer is freed. |
+ HostGlobals::Get()->GetResourceTracker()->ReleaseResource(message_resource); |
+} |
+ |
+void PluginInstance::KeyError(PP_Instance instance, |
+ PP_Var key_system_var, |
+ PP_Var session_id_var, |
+ int32_t media_error, |
+ int32_t system_error) { |
+ StringVar* key_system_string = StringVar::FromPPVar(key_system_var); |
+ StringVar* session_id_string = StringVar::FromPPVar(session_id_var); |
+ |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(key_system_var); |
+ HostGlobals::Get()->GetVarTracker()->ReleaseVar(session_id_var); |
+} |
+ |
+void PluginInstance::DeliverBlock(PP_Instance instance, |
+ PP_Resource decrypted_block, |
+ PP_CompletionCallback callback) { |
+ // TODO(tomfinegan): Determine where |decrypted_block| goes, and what |
+ // callback actually is (callback will likely be the result of some |
+ // base::Bind usage in the media stack. Hash this out with xhwang. |
+ // |
+ HostGlobals::Get()->GetResourceTracker()->ReleaseResource(decrypted_block); |
+} |
+ |
+void PluginInstance::DeliverFrame(PP_Instance instance, |
+ PP_Resource decrypted_frame, |
+ PP_CompletionCallback callback) { |
+ // Not implemented in v0.1 of the EME/CDM work. |
+} |
+ |
+void PluginInstance::DeliverSamples(PP_Instance instance, |
+ PP_Resource decrypted_samples, |
+ PP_CompletionCallback callback) { |
+ // Not implemented in v0.1 of the EME/CDM work. |
+} |
+ |
+ |
void PluginInstance::NumberOfFindResultsChanged(PP_Instance instance, |
int32_t total, |
PP_Bool final_result) { |