PPAPI/NaCl: Move event dispatching from the plugin

chrome/renderer/pepper/ppb_nacl_private_impl.cc

Index: chrome/renderer/pepper/ppb_nacl_private_impl.cc
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
index 6717bbacf5cf09cdc8a1c78e907d7df6412d4e55..72611fc4aeaba473f97b32ca3004d4a3431b001f 100644
--- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc
+++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
@@ -29,11 +29,13 @@
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
+#include "third_party/WebKit/public/web/WebDOMResourceProgressEvent.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebView.h"
+#include "v8/include/v8.h"
 
 namespace {
 
@@ -79,15 +81,15 @@ static int GetRoutingID(PP_Instance instance) {
 
 // Launch NaCl's sel_ldr process.
 PP_ExternalPluginResult LaunchSelLdr(PP_Instance instance,
-                           const char* alleged_url,
-                           PP_Bool uses_irt,
-                           PP_Bool uses_ppapi,
-                           PP_Bool enable_ppapi_dev,
-                           PP_Bool enable_dyncode_syscalls,
-                           PP_Bool enable_exception_handling,
-                           PP_Bool enable_crash_throttling,
-                           void* imc_handle,
-                           struct PP_Var* error_message) {
+                                     const char* alleged_url,
+                                     PP_Bool uses_irt,
+                                     PP_Bool uses_ppapi,
+                                     PP_Bool enable_ppapi_dev,
+                                     PP_Bool enable_dyncode_syscalls,
+                                     PP_Bool enable_exception_handling,
+                                     PP_Bool enable_crash_throttling,
+                                     void* imc_handle,
+                                     struct PP_Var* error_message) {
   nacl::FileDescriptor result_socket;
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
@@ -349,6 +351,75 @@ PP_FileHandle OpenNaClExecutable(PP_Instance instance,
   return handle;
 }
 
+WebKit::WebString EventTypeToString(PP_NaClEventType event_type) {
+  switch (event_type) {
+    case PP_NACL_EVENT_LOADSTART:
+      return WebKit::WebString::fromUTF8("loadstart");
+    case PP_NACL_EVENT_PROGRESS:
+      return WebKit::WebString::fromUTF8("progress");
+    case PP_NACL_EVENT_ERROR:
+      return WebKit::WebString::fromUTF8("error");
+    case PP_NACL_EVENT_ABORT:
+      return WebKit::WebString::fromUTF8("abort");
+    case PP_NACL_EVENT_LOAD:
+      return WebKit::WebString::fromUTF8("load");
+    case PP_NACL_EVENT_LOADEND:
+      return WebKit::WebString::fromUTF8("loadend");
+    case PP_NACL_EVENT_CRASH:
+      return WebKit::WebString::fromUTF8("crash");
+  }
+  NOTIMPLEMENTED();
+  return WebKit::WebString();
+}
+
+void DispatchEvent(PP_Instance instance,
+                   PP_NaClEventType event_type,
+                   struct PP_Var resource_url,
+                   PP_Bool length_is_computable,
+                   uint64_t loaded_bytes,
+                   uint64_t total_bytes) {
+  content::PepperPluginInstance* plugin_instance =
+      content::PepperPluginInstance::Get(instance);
+  if (!plugin_instance) {
+    NOTREACHED();
+    return;
+  }
+  WebKit::WebPluginContainer* container = plugin_instance->GetContainer();
+  // It's possible that container() is NULL if the plugin has been removed from
+  // the DOM (but the PluginInstance is not destroyed yet).
+  if (!container)
+    return;
+  WebKit::WebFrame* frame = container->element().document().frame();

[teravest1, 2013/10/31 18:39:56]

Why do you set frame here and check if it's non-NULL?

[dmichael (off chromium), 2013/10/31 20:08:08]

Ah, yes, I don't use it :-). This is probably a bad copy/paste, thanks for
pointing it out; I'll fix it in the next patch set.

+  if (!frame)
+    return;
+  v8::HandleScope handle_scope(plugin_instance->GetIsolate());
+  v8::Local<v8::Context> context(
+      plugin_instance->GetIsolate()->GetCurrentContext());
+  if (context.IsEmpty()) {
+    // If there's no JavaScript on the stack, we have to make a new Context.
+    context = v8::Context::New(plugin_instance->GetIsolate());
+  }
+  v8::Context::Scope context_scope(context);
+
+  ppapi::StringVar* url_var = ppapi::StringVar::FromPPVar(resource_url);
+  if (url_var) {
+    WebKit::WebString url_string = WebKit::WebString::fromUTF8(
+        url_var->value().data(), url_var->value().size());
+    WebKit::WebDOMResourceProgressEvent event(EventTypeToString(event_type),
+                                              PP_ToBool(length_is_computable),
+                                              loaded_bytes,
+                                              total_bytes,
+                                              url_string);
+    container->element().dispatchEvent(event);
+  } else {
+    WebKit::WebDOMProgressEvent event(EventTypeToString(event_type),
+                                      PP_ToBool(length_is_computable),
+                                      loaded_bytes,
+                                      total_bytes);
+    container->element().dispatchEvent(event);
+  }
+}
+
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
@@ -362,7 +433,8 @@ const PPB_NaCl_Private nacl_interface = {
   &ReportTranslationFinished,
   &IsOffTheRecord,
   &ReportNaClError,
-  &OpenNaClExecutable
+  &OpenNaClExecutable,
+  &DispatchEvent
 };
 
 }  // namespace