diff options
author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 19:49:35 +0000 |
---|---|---|
committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 19:49:35 +0000 |
commit | 91240c947358b33cc19c0923a06d116ab36737dd (patch) | |
tree | 7897c99ad9b41d7735c7a42e0ea75fe6f76760b3 /o3d/tests/common | |
parent | 2e25a9f4152a90a179ad37206bff79e1198379d7 (diff) | |
download | chromium_src-91240c947358b33cc19c0923a06d116ab36737dd.zip chromium_src-91240c947358b33cc19c0923a06d116ab36737dd.tar.gz chromium_src-91240c947358b33cc19c0923a06d116ab36737dd.tar.bz2 |
Asynchronous tick now uses NPN_PluginAsyncCall.URL streaming callbacks are now also asynchronous.Implemented NPN_PluginAsyncCall for IE.Allowed WM_PAINT handler to be reentered because it no longer calls into the browser (except to schedule an asynchronous tick if none is pending).Fixed a bug where the EventManager would crash if an event callback called cleanUp on the client.Cleanup destroys all the packs. Doing this in NPP_Destroy seems to make Chrome timeout and fail to load the next page.Tar and GZ decoding happens on a new thread.
Review URL: http://codereview.chromium.org/155733
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/common')
-rw-r--r-- | o3d/tests/common/build.scons | 2 | ||||
-rw-r--r-- | o3d/tests/common/cross/main.cc | 2 | ||||
-rw-r--r-- | o3d/tests/common/mac/testing_common.mm (renamed from o3d/tests/common/mac/testing_common.cc) | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/o3d/tests/common/build.scons b/o3d/tests/common/build.scons index 8add24f..69db65f 100644 --- a/o3d/tests/common/build.scons +++ b/o3d/tests/common/build.scons @@ -49,7 +49,7 @@ if env.Bit('linux'): if env.Bit('mac'): inputs += [ - "mac/testing_common.cc", + "mac/testing_common.mm", ] o3dcore_lib = env.ComponentLibrary("testing_common", inputs) diff --git a/o3d/tests/common/cross/main.cc b/o3d/tests/common/cross/main.cc index b4bdbd2..b8c3fc3 100644 --- a/o3d/tests/common/cross/main.cc +++ b/o3d/tests/common/cross/main.cc @@ -32,6 +32,7 @@ // defines the common main() for all unit tests #include <build/build_config.h> +#include "base/at_exit.h" #include "gtest/gtest.h" #ifdef OS_WIN @@ -39,6 +40,7 @@ int test_main(int argc, wchar_t **argv) { #else int test_main(int argc, char **argv) { #endif + ::base::AtExitManager at_exit_manager; testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/o3d/tests/common/mac/testing_common.cc b/o3d/tests/common/mac/testing_common.mm index 2f7cffa..c00ef34 100644 --- a/o3d/tests/common/mac/testing_common.cc +++ b/o3d/tests/common/mac/testing_common.mm @@ -63,6 +63,8 @@ const unsigned int kWindowHeight = 600; extern int test_main(int argc, char **argv); int main(int argc, char *argv[]) { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + std::string error; if (!o3d::RendererInstallCheck(&error)) { return false; @@ -132,5 +134,7 @@ int main(int argc, char *argv[]) { g_program_path = NULL; g_program_name = NULL; + [pool release]; + return ret; } |