diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 03:47:31 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 03:47:31 +0000 |
commit | 2c9f03f623ecde4e4d9ff2f7176196151e05c0b7 (patch) | |
tree | 435fd0c2f4545cfa54e393dc12bb3c05da3df6cb | |
parent | 4a74b0acc891ed67f722c4d82b94e4648e006d08 (diff) | |
download | chromium_src-2c9f03f623ecde4e4d9ff2f7176196151e05c0b7.zip chromium_src-2c9f03f623ecde4e4d9ff2f7176196151e05c0b7.tar.gz chromium_src-2c9f03f623ecde4e4d9ff2f7176196151e05c0b7.tar.bz2 |
Chrome-side of making CallOnMainThread use a completion callback.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2819036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51489 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | webkit/glue/plugins/pepper_plugin_module.cc | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -158,7 +158,7 @@ deps = { Var("libvpx_revision"), "src/third_party/ppapi": - "http://ppapi.googlecode.com/svn/trunk@84", + "http://ppapi.googlecode.com/svn/trunk@94", "src/third_party/libjingle/source": "http://libjingle.googlecode.com/svn/branches/nextsnap@" + diff --git a/webkit/glue/plugins/pepper_plugin_module.cc b/webkit/glue/plugins/pepper_plugin_module.cc index 4752156..3a63384 100644 --- a/webkit/glue/plugins/pepper_plugin_module.cc +++ b/webkit/glue/plugins/pepper_plugin_module.cc @@ -95,10 +95,12 @@ double GetTime() { return base::Time::Now().ToDoubleT(); } -void CallOnMainThread(int delay_in_msec, void (*func)(void*), void* context) { +void CallOnMainThread(int delay_in_msec, + PP_CompletionCallback callback, + int32_t result) { GetMainThreadMessageLoop()->PostDelayedTask( FROM_HERE, - NewRunnableFunction(func, context), + NewRunnableFunction(callback.func, callback.user_data, result), delay_in_msec); } |