commit 94f46216cd816730cc0f802492b7673a7cdf05e0
author Andrei Popescu Tue Mar 24 19:46:24 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Mar 24 19:46:24 2009 -0700
tree c39758c99423d5758a7605720f5e4247324cda7c
parent 938137dd7ec1276a0187356cd1a06ba031504b2d

Automated import from //branches/master/...@141189,141189

WebCore/bridge/NP_jsobject.cpp

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 @@
     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)