Pepper: Clean up ProgressEvent logic.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/renderer/histogram.h"
 #include "components/nacl/renderer/json_manifest.h"
 #include "components/nacl/renderer/manifest_downloader.h"
 #include "components/nacl/renderer/manifest_service_channel.h"
 #include "components/nacl/renderer/nexe_load_manager.h"
 #include "components/nacl/renderer/pnacl_translation_resource_host.h"
+#include "components/nacl/renderer/progress_event.h"
 #include "components/nacl/renderer/sandbox_arch.h"
 #include "components/nacl/renderer/trusted_plugin_channel.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "net/base/data_url.h"
@@ skipping 601 matching lines @@
 
   if (out_fd == IPC::InvalidPlatformFileForTransit()) {
     return base::kInvalidPlatformFileValue;
   }
 
   base::PlatformFile handle =
       IPC::PlatformFileForTransitToPlatformFile(out_fd);
   return handle;
 }
 
-void DispatchEventOnMainThread(PP_Instance instance,
-                               PP_NaClEventType event_type,
-                               const std::string& resource_url,
-                               PP_Bool length_is_computable,
-                               uint64_t loaded_bytes,
-                               uint64_t total_bytes);
-
 void DispatchEvent(PP_Instance instance,
                    PP_NaClEventType event_type,
                    const char *resource_url,
                    PP_Bool length_is_computable,
                    uint64_t loaded_bytes,
                    uint64_t total_bytes) {
-  ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
-      FROM_HERE,
-      base::Bind(&DispatchEventOnMainThread,
-                 instance,
-                 event_type,
-                 std::string(resource_url),
-                 length_is_computable,
-                 loaded_bytes,
-                 total_bytes));
-}
-
-void DispatchEventOnMainThread(PP_Instance instance,
-                               PP_NaClEventType event_type,
-                               const std::string& resource_url,
-                               PP_Bool length_is_computable,
-                               uint64_t loaded_bytes,
-                               uint64_t total_bytes) {
-  NexeLoadManager* load_manager =
-      GetNexeLoadManager(instance);
-  // The instance may have been destroyed after we were scheduled, so do
-  // nothing if it's gone.
-  if (load_manager) {
-    NexeLoadManager::ProgressEvent event(event_type);
-    event.resource_url = resource_url;
-    event.length_is_computable = PP_ToBool(length_is_computable);
-    event.loaded_bytes = loaded_bytes;
-    event.total_bytes = total_bytes;
-    load_manager->DispatchEvent(event);
-  }
+  ProgressEvent event(event_type);
+  event.resource_url = resource_url;
+  event.length_is_computable = PP_ToBool(length_is_computable);
+  event.loaded_bytes = loaded_bytes;
+  event.total_bytes = total_bytes;

[dmichael (off chromium), 2014/05/08 16:19:02]

I don't particularly care, but this looks like it could use the constructor like
other places. Or other places could look like this, if you think this is better.
Or is there a reason for this to be different?

[teravest, 2014/05/08 16:42:03]

Done.

+  PostDispatchProgressEvent(instance, event);
 }
 
 void NexeFileDidOpen(PP_Instance instance,
                      int32_t pp_error,
                      int32_t fd,
                      int32_t http_status,
                      int64_t nexe_bytes_read,
                      const char* url,
                      int64_t time_since_open) {
   NexeLoadManager* load_manager = GetNexeLoadManager(instance);
@@ skipping 528 matching lines @@
   &GetPNaClResourceInfo
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl