Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1834)

Unified Diff: content/renderer/pepper/pepper_file_io_host.cc

Issue 20777009: A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by ha… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_file_io_host.cc
===================================================================
--- content/renderer/pepper/pepper_file_io_host.cc (revision 214423)
+++ content/renderer/pepper/pepper_file_io_host.cc (working copy)
@@ -20,7 +20,6 @@
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/ppb_file_ref_impl.h"
#include "content/renderer/pepper/quota_file_io.h"
-#include "content/renderer/pepper/resource_helper.h"
#include "content/renderer/render_thread_impl.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppb_file_io.h"
@@ -223,20 +222,17 @@
weak_factory_.GetWeakPtr(),
context->MakeReplyMessageContext());
file_system_dispatcher->OpenFile(
- file_system_url_, flags,
- base::Bind(&DidOpenFileSystemURL, callback),
- base::Bind(&DidFailOpenFileSystemURL, callback));
+ file_system_url_, flags,
+ base::Bind(&DidOpenFileSystemURL, callback),
+ base::Bind(&DidFailOpenFileSystemURL, callback));
} else {
- PepperHelperImpl* helper = static_cast<PepperPluginInstanceImpl*>(
- PepperPluginInstance::Get(pp_instance()))->helper();
- if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL || !helper)
+ if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL)
return PP_ERROR_FAILED;
- if (!helper->AsyncOpenFile(
- file_ref->GetSystemPath(), flags,
- base::Bind(&PepperFileIOHost::ExecutePlatformOpenFileCallback,
- weak_factory_.GetWeakPtr(),
- context->MakeReplyMessageContext())))
- return PP_ERROR_FAILED;
+ RenderThreadImpl::current()->AsyncOpenFile(
+ file_ref->GetSystemPath(), flags,
+ base::Bind(&PepperFileIOHost::ExecutePlatformOpenFileCallback,
+ weak_factory_.GetWeakPtr(),
+ context->MakeReplyMessageContext()));
}
state_manager_.SetPendingOperation(FileIOStateManager::OPERATION_EXCLUSIVE);

Powered by Google App Engine
This is Rietveld 408576698