diff options
| author | Andrei Popescu <> | 2009-03-24 19:46:53 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 19:46:53 -0700 |
| commit | 4b1cfb162bc380ab4f8ea3c89f50612e2c54d632 (patch) | |
| tree | c39758c99423d5758a7605720f5e4247324cda7c | |
| parent | 79c7710cc15b5e306c0b76ff5e7b84a7628519d8 (diff) | |
| download | external_webkit-4b1cfb162bc380ab4f8ea3c89f50612e2c54d632.zip external_webkit-4b1cfb162bc380ab4f8ea3c89f50612e2c54d632.tar.gz external_webkit-4b1cfb162bc380ab4f8ea3c89f50612e2c54d632.tar.bz2 | |
Automated import from //branches/donutburger/...@141184,141184
| -rw-r--r-- | WebCore/bridge/NP_jsobject.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/bridge/NP_jsobject.cpp b/WebCore/bridge/NP_jsobject.cpp index 19b4b60..45f9f6d 100644 --- a/WebCore/bridge/NP_jsobject.cpp +++ b/WebCore/bridge/NP_jsobject.cpp @@ -379,11 +379,17 @@ bool _NPN_HasMethod(NPP, NPObject* o, NPIdentifier methodName) return false; } -void _NPN_SetException(NPObject*, const NPUTF8* message) +void _NPN_SetException(NPObject* o, const NPUTF8* message) { +#ifdef ANDROID_NPN_SETEXCEPTION + if (o->_class == NPScriptObjectClass) { + JSC::Bindings::SetGlobalException(message); + } +#else // Ignorning the NPObject param is consistent with the Mozilla implementation. UString exception(message); CInstance::setGlobalException(exception); +#endif // ANDROID_NPN_SETEXCEPTION } bool _NPN_Enumerate(NPP, NPObject* o, NPIdentifier** identifier, uint32_t* count) |