diff options
| author | Nicolas Roard <nicolas@android.com> | 2009-11-12 14:57:10 -0800 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2009-11-12 15:24:11 -0800 |
| commit | 50140f9c6f1ba2e46e440a7910438f68596c034c (patch) | |
| tree | 5ec8c3c777e26a8c67d475eb08daf42ab0649964 /WebCore/bridge/c/c_instance.cpp | |
| parent | 7f9b227f4bbeb58184a4fd914ab15e384a603e8d (diff) | |
| download | external_webkit-50140f9c6f1ba2e46e440a7910438f68596c034c.zip external_webkit-50140f9c6f1ba2e46e440a7910438f68596c034c.tar.gz external_webkit-50140f9c6f1ba2e46e440a7910438f68596c034c.tar.bz2 | |
Remove android-specific plugin exception mechanism
Diffstat (limited to 'WebCore/bridge/c/c_instance.cpp')
| -rw-r--r-- | WebCore/bridge/c/c_instance.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/bridge/c/c_instance.cpp b/WebCore/bridge/c/c_instance.cpp index 81b33c8..77b5966 100644 --- a/WebCore/bridge/c/c_instance.cpp +++ b/WebCore/bridge/c/c_instance.cpp @@ -121,9 +121,6 @@ JSValue CInstance::invokeMethod(ExecState* exec, const MethodList& methodList, c convertValueToNPVariant(exec, args.at(i), &cArgs[i]); // Invoke the 'C' method. -#ifdef ANDROID_NPN_SETEXCEPTION - SetGlobalException(0); -#endif bool retval = true; NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); @@ -143,9 +140,6 @@ JSValue CInstance::invokeMethod(ExecState* exec, const MethodList& methodList, c JSValue resultValue = convertNPVariantToValue(exec, &resultVariant, _rootObject.get()); _NPN_ReleaseVariantValue(&resultVariant); -#ifdef ANDROID_NPN_SETEXCEPTION - MoveGlobalExceptionToExecState(exec); -#endif return resultValue; } @@ -163,9 +157,6 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec, const ArgList& args) convertValueToNPVariant(exec, args.at(i), &cArgs[i]); // Invoke the 'C' method. -#ifdef ANDROID_NPN_SETEXCEPTION - SetGlobalException(0); -#endif bool retval = true; NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); @@ -184,9 +175,6 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec, const ArgList& args) JSValue resultValue = convertNPVariantToValue(exec, &resultVariant, _rootObject.get()); _NPN_ReleaseVariantValue(&resultVariant); -#ifdef ANDROID_NPN_SETEXCEPTION - MoveGlobalExceptionToExecState(exec); -#endif return resultValue; } |