diff options
Diffstat (limited to 'Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp')
| -rw-r--r-- | Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp b/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp index d6745bebc..f2647da29 100644 --- a/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp +++ b/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp @@ -32,7 +32,6 @@ #include "config.h" #include "ScriptFunctionCall.h" -#include "JSCInlines.h" #include "JSLock.h" #include "ScriptValue.h" #include <wtf/text/WTFString.h> @@ -121,7 +120,7 @@ Deprecated::ScriptValue ScriptFunctionCall::call(bool& hadException) JSLockHolder lock(m_exec); - JSValue function = thisObject->get(m_exec, Identifier::fromString(m_exec, m_name)); + JSValue function = thisObject->get(m_exec, Identifier(m_exec, m_name)); if (m_exec->hadException()) { hadException = true; return Deprecated::ScriptValue(); @@ -133,15 +132,13 @@ Deprecated::ScriptValue ScriptFunctionCall::call(bool& hadException) return Deprecated::ScriptValue(); JSValue result; - NakedPtr<Exception> exception; if (m_callHandler) - result = m_callHandler(m_exec, function, callType, callData, thisObject, m_arguments, exception); + result = m_callHandler(m_exec, function, callType, callData, thisObject, m_arguments); else - result = JSC::call(m_exec, function, callType, callData, thisObject, m_arguments, exception); + result = JSC::call(m_exec, function, callType, callData, thisObject, m_arguments); - if (exception) { - // Do not treat a terminated execution exception as having an exception. Just treat it as an empty result. - hadException = !isTerminatedExecutionException(exception); + if (m_exec->hadException()) { + hadException = true; return Deprecated::ScriptValue(); } |