diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
| commit | 41386e9cb918eed93b3f13648cbef387e371e451 (patch) | |
| tree | a97f9d7bd1d9d091833286085f72da9d83fd0606 /Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp | |
| parent | e15dd966d523731101f70ccf768bba12435a0208 (diff) | |
| download | WebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz | |
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp')
| -rw-r--r-- | Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp b/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp index f7254d9a8..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,13 +132,12 @@ 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) { + if (m_exec->hadException()) { hadException = true; return Deprecated::ScriptValue(); } |