summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 06:20:44 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 06:20:44 +0000
commit3b5c685851f27792d366080840ed074c6087760c (patch)
tree96f1260a1874784f6d88a57e9ea302a66e6e872b /ppapi/proxy
parentca622eb85d65a358576f42d07df92662323c6c3d (diff)
downloadchromium_src-3b5c685851f27792d366080840ed074c6087760c.zip
chromium_src-3b5c685851f27792d366080840ed074c6087760c.tar.gz
chromium_src-3b5c685851f27792d366080840ed074c6087760c.tar.bz2
PPAPI: Remove instance param from GetFileTaskRunner
BUG= Review URL: https://codereview.chromium.org/25328002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/file_io_resource.cc6
-rw-r--r--ppapi/proxy/plugin_globals.cc2
-rw-r--r--ppapi/proxy/plugin_globals.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/proxy/file_io_resource.cc b/ppapi/proxy/file_io_resource.cc
index a2f55f1..d6b8395 100644
--- a/ppapi/proxy/file_io_resource.cc
+++ b/ppapi/proxy/file_io_resource.cc
@@ -154,7 +154,7 @@ int32_t FileIOResource::Query(PP_FileInfo* info,
// For the non-blocking case, post a task to the file thread and add a
// completion task to write the result.
base::PostTaskAndReplyWithResult(
- PpapiGlobals::Get()->GetFileTaskRunner(pp_instance()),
+ PpapiGlobals::Get()->GetFileTaskRunner(),
FROM_HERE,
Bind(&FileIOResource::QueryOp::DoWork, query_op),
RunWhileLocked(Bind(&TrackedCallback::Run, callback)));
@@ -317,7 +317,7 @@ int32_t FileIOResource::ReadValidated(int64_t offset,
// For the non-blocking case, post a task to the file thread.
base::PostTaskAndReplyWithResult(
- PpapiGlobals::Get()->GetFileTaskRunner(pp_instance()),
+ PpapiGlobals::Get()->GetFileTaskRunner(),
FROM_HERE,
Bind(&FileIOResource::ReadOp::DoWork, read_op),
RunWhileLocked(Bind(&TrackedCallback::Run, callback)));
@@ -331,7 +331,7 @@ void FileIOResource::CloseFileHandle() {
if (file_handle_ != base::kInvalidPlatformFileValue) {
// Close our local fd on the file thread.
base::TaskRunner* file_task_runner =
- PpapiGlobals::Get()->GetFileTaskRunner(pp_instance());
+ PpapiGlobals::Get()->GetFileTaskRunner();
file_task_runner->PostTask(FROM_HERE,
base::Bind(&DoClose, file_handle_));
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc
index 83217f0..fa5530e 100644
--- a/ppapi/proxy/plugin_globals.cc
+++ b/ppapi/proxy/plugin_globals.cc
@@ -150,7 +150,7 @@ MessageLoopShared* PluginGlobals::GetCurrentMessageLoop() {
return MessageLoopResource::GetCurrent();
}
-base::TaskRunner* PluginGlobals::GetFileTaskRunner(PP_Instance instance) {
+base::TaskRunner* PluginGlobals::GetFileTaskRunner() {
if (!file_thread_.get()) {
file_thread_.reset(new base::Thread("Plugin::File"));
base::Thread::Options options;
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h
index 31adef5..bc55245 100644
--- a/ppapi/proxy/plugin_globals.h
+++ b/ppapi/proxy/plugin_globals.h
@@ -72,7 +72,7 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
const std::string& source,
const std::string& value) OVERRIDE;
virtual MessageLoopShared* GetCurrentMessageLoop() OVERRIDE;
- base::TaskRunner* GetFileTaskRunner(PP_Instance instance) OVERRIDE;
+ base::TaskRunner* GetFileTaskRunner() OVERRIDE;
// Returns the channel for sending to the browser.
IPC::Sender* GetBrowserSender();