From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Wed, 20 May 2015 09:56:07 +0000
Subject: webkitgtk-2.4.9

---
 Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp')

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();
     }
-- 
cgit v1.2.1