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/converter | |
| 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/converter')
| -rw-r--r-- | o3d/converter/build.scons | 14 | ||||
| -rw-r--r-- | o3d/converter/cross/converter.cc | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/o3d/converter/build.scons b/o3d/converter/build.scons index 0a2006d..fd0d8c7 100644 --- a/o3d/converter/build.scons +++ b/o3d/converter/build.scons @@ -47,6 +47,7 @@ env.Append( 'o3dCorePlatform', 'o3dSerializer', 'o3dSerializationObjects', + 'o3dCore', # Archive and Core are mutually dependent so Core appears twice. 'o3dUtils', 'o3d_base', 'FColladaU', @@ -80,9 +81,20 @@ if env.Bit('mac'): FRAMEWORKS = [ 'ApplicationServices', 'Cg', + 'Cocoa', 'Foundation', 'OpenGL', - ], + ], + LIBS = [ + 'event', + ], + ) + +if env.Bit('linux'): + env.Append( + LIBS = [ + 'event', + ], ) inputs = [ diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc index 9abde79..ac1b16e 100644 --- a/o3d/converter/cross/converter.cc +++ b/o3d/converter/cross/converter.cc @@ -256,9 +256,7 @@ bool Convert(const FilePath& in_filename, // the loading process. AddBinaryElements(collada, &archive_generator); - archive_generator.Finalize(); - - file_util::CloseFile(out_file); + archive_generator.Close(true); pack->Destroy(); if (error_messages) { |