diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 19:18:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 19:18:52 +0000 |
| commit | 47a961c13f61cdbd00a7020a5a8173586a8ed892 (patch) | |
| tree | a89ea8f0c81f5c74cb5bcaf852e4e83ab21fbc75 /ppapi/tests | |
| parent | 8367f7b3aab8365ed5e696e4720a2a416d956d0a (diff) | |
| download | chromium_src-47a961c13f61cdbd00a7020a5a8173586a8ed892.zip chromium_src-47a961c13f61cdbd00a7020a5a8173586a8ed892.tar.gz chromium_src-47a961c13f61cdbd00a7020a5a8173586a8ed892.tar.bz2 | |
Add support for threadsafe completion callback factory.
This also makes the default be threadsafe. The old factory wasn't threadsafe even to the extent claimed in the header which was causing hangs in plugins
BUG=136284
Review URL: https://chromiumcodereview.appspot.com/10696157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
| -rw-r--r-- | ppapi/tests/all_cpp_includes.h | 5 | ||||
| -rw-r--r-- | ppapi/tests/testing_instance.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h index 6abe681..a85fa03 100644 --- a/ppapi/tests/all_cpp_includes.h +++ b/ppapi/tests/all_cpp_includes.h @@ -66,8 +66,11 @@ #include "ppapi/cpp/var.h" #include "ppapi/cpp/var_array_buffer.h" #include "ppapi/cpp/websocket.h" +#include "ppapi/utility/completion_callback_factory.h" +#include "ppapi/utility/completion_callback_factory_thread_traits.h" #include "ppapi/utility/graphics/paint_aggregator.h" #include "ppapi/utility/graphics/paint_manager.h" -#include "ppapi/utility/non_thread_safe_ref_count.h" +#include "ppapi/utility/threading/lock.h" +#include "ppapi/utility/threading/simple_thread.h" #endif // PPAPI_TESTS_ALL_CPP_INCLUDES_H_ diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h index 1b2acbf..33ed21c 100644 --- a/ppapi/tests/testing_instance.h +++ b/ppapi/tests/testing_instance.h @@ -15,6 +15,11 @@ #include "ppapi/cpp/private/instance_private.h" #endif +// Windows defines 'PostMessage', so we have to undef it. +#ifdef PostMessage +#undef PostMessage +#endif + class TestCase; // How signaling works: |