diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 20:38:14 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 20:38:14 +0000 |
| commit | 18f6ac530752c99f257288e60e7eb2070dc1ad89 (patch) | |
| tree | c2e05b7486819da55f3d76f3cc1f38c3fb21866d /o3d/plugin/cross/o3d_glue.cc | |
| parent | 97c22ee2f0123d1d4dbdb705809d97d0f1d9f65a (diff) | |
| download | chromium_src-18f6ac530752c99f257288e60e7eb2070dc1ad89.zip chromium_src-18f6ac530752c99f257288e60e7eb2070dc1ad89.tar.gz chromium_src-18f6ac530752c99f257288e60e7eb2070dc1ad89.tar.bz2 | |
Integrate new nixysa rev with work around for Safari 5.0+ crash.
Also ensures all NPN_PluginThreadAsyncCall() uses are guarded by IsPluginThreadAsyncCallSupported().
Also fix-up indenting in o3d_layer.mm.
BUG=none
TEST=repeated loading of O3D in Safari 5.0.2 on Mac
Review URL: http://codereview.chromium.org/3677002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/cross/o3d_glue.cc')
| -rw-r--r-- | o3d/plugin/cross/o3d_glue.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc index 84035f6..cce9f2a 100644 --- a/o3d/plugin/cross/o3d_glue.cc +++ b/o3d/plugin/cross/o3d_glue.cc @@ -44,6 +44,7 @@ #include "plugin/cross/o3d_glue.h" #include "plugin/cross/config.h" #include "plugin/cross/stream_manager.h" +#include "third_party/nixysa/static_glue/npapi/npn_api.h" #include "client_glue.h" #include "globals_glue.h" @@ -1030,10 +1031,7 @@ void PluginObject::AsyncTick() { } else { // Invoke Tick asynchronously if NPN_PluginThreadAsyncCall is supported. // Otherwise invoke it synchronously. - int plugin_major, plugin_minor, browser_major, browser_minor; - NPN_Version(&plugin_major, &plugin_minor, &browser_major, &browser_minor); - if (browser_major > 0 || - browser_minor >= NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL) { + if (IsPluginThreadAsyncCallSupported(npp_)) { NPN_PluginThreadAsyncCall(npp_, TickPluginObject, this); } else { Tick(); |