diff options
author | nfullagar@chromium.org <nfullagar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 01:45:16 +0000 |
---|---|---|
committer | nfullagar@chromium.org <nfullagar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 01:45:16 +0000 |
commit | d11adbbd044e5eb1c87159ef43ef31e5f9576ad2 (patch) | |
tree | 7a801b932304cf065f18c0588dff9ab3873810cf /ppapi | |
parent | c1e82bc9ead6615b8b56219de299678b0be2f806 (diff) | |
download | chromium_src-d11adbbd044e5eb1c87159ef43ef31e5f9576ad2.zip chromium_src-d11adbbd044e5eb1c87159ef43ef31e5f9576ad2.tar.gz chromium_src-d11adbbd044e5eb1c87159ef43ef31e5f9576ad2.tar.bz2 |
Also run 3D tests on background thread.
BUG=none
TEST=this is the test
Review URL: https://chromiumcodereview.appspot.com/11411048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/tests/test_graphics_3d.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ppapi/tests/test_graphics_3d.cc b/ppapi/tests/test_graphics_3d.cc index e1b4e33..65678c7 100644 --- a/ppapi/tests/test_graphics_3d.cc +++ b/ppapi/tests/test_graphics_3d.cc @@ -15,6 +15,7 @@ #include "ppapi/cpp/graphics_3d.h" #include "ppapi/cpp/module.h" #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h" +#include "ppapi/tests/test_case.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" @@ -30,9 +31,9 @@ bool TestGraphics3D::Init() { } void TestGraphics3D::RunTests(const std::string& filter) { - RUN_TEST(FramePPAPI, filter); - RUN_TEST(FrameGL, filter); - RUN_TEST(ExtensionsGL, filter); + RUN_CALLBACK_TEST(TestGraphics3D, FramePPAPI, filter); + RUN_CALLBACK_TEST(TestGraphics3D, FrameGL, filter); + RUN_CALLBACK_TEST(TestGraphics3D, ExtensionsGL, filter); } std::string TestGraphics3D::TestFramePPAPI() { @@ -135,7 +136,7 @@ std::string TestGraphics3D::TestExtensionsGL() { } int32_t TestGraphics3D::SwapBuffersSync(pp::Graphics3D* context) { - TestCompletionCallback callback(instance_->pp_instance(), true); + TestCompletionCallback callback(instance_->pp_instance(), callback_type()); int32_t rv = context->SwapBuffers(callback); if (rv != PP_OK_COMPLETIONPENDING) return rv; |