summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 21:01:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 21:01:41 +0000
commit6ad63ef9d55f4b7a1997f27b3347ba1a79a49f49 (patch)
tree771226ba88e7e4f979b326d6407d087ead356f3c
parent32369d763913881d4afbab0ef8c6c769d22cad96 (diff)
downloadchromium_src-6ad63ef9d55f4b7a1997f27b3347ba1a79a49f49.zip
chromium_src-6ad63ef9d55f4b7a1997f27b3347ba1a79a49f49.tar.gz
chromium_src-6ad63ef9d55f4b7a1997f27b3347ba1a79a49f49.tar.bz2
Add hook into pepper to query if running on the main thread.
Useful for plugins that make heavy use of background threads. Review URL: http://codereview.chromium.org/3104031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57233 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/plugins/pepper_plugin_module.cc7
2 files changed, 7 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 1aec58c..7a92f82 100644
--- a/DEPS
+++ b/DEPS
@@ -163,7 +163,7 @@ deps = {
Var("libvpx_revision"),
"src/third_party/ppapi":
- "http://ppapi.googlecode.com/svn/trunk@207",
+ "http://ppapi.googlecode.com/svn/trunk@209",
"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 3b44868..6af71dc 100644
--- a/webkit/glue/plugins/pepper_plugin_module.cc
+++ b/webkit/glue/plugins/pepper_plugin_module.cc
@@ -120,13 +120,18 @@ void CallOnMainThread(int delay_in_msec,
delay_in_msec);
}
+bool IsMainThread() {
+ return GetMainThreadMessageLoop()->BelongsToCurrentThread();
+}
+
const PPB_Core core_interface = {
&AddRefResource,
&ReleaseResource,
&MemAlloc,
&MemFree,
&GetTime,
- &CallOnMainThread
+ &CallOnMainThread,
+ &IsMainThread
};
// PPB_Testing -----------------------------------------------------------------