From dc6262b587c71c14e30d93e57ed812e36a79a33e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 24 Sep 2012 13:09:44 +0200 Subject: Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343) New snapshot with build fixes for latest qtbase --- Source/JavaScriptCore/runtime/JSBoundFunction.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSBoundFunction.cpp') diff --git a/Source/JavaScriptCore/runtime/JSBoundFunction.cpp b/Source/JavaScriptCore/runtime/JSBoundFunction.cpp index 08d6831c0..3815c144e 100644 --- a/Source/JavaScriptCore/runtime/JSBoundFunction.cpp +++ b/Source/JavaScriptCore/runtime/JSBoundFunction.cpp @@ -89,14 +89,9 @@ JSBoundFunction* JSBoundFunction::create(ExecState* exec, JSGlobalObject* global return function; } -bool JSBoundFunction::hasInstance(JSObject* object, ExecState* exec, JSValue value, JSValue) +bool JSBoundFunction::customHasInstance(JSObject* object, ExecState* exec, JSValue value) { - JSBoundFunction* thisObject = jsCast(object); - // FIXME: our instanceof implementation will have already (incorrectly) performed - // a [[Get]] of .prototype from the bound function object, which is incorrect! - // https://bugs.webkit.org/show_bug.cgi?id=68656 - JSValue proto = thisObject->m_targetFunction->get(exec, exec->propertyNames().prototype); - return thisObject->m_targetFunction->methodTable()->hasInstance(thisObject->m_targetFunction.get(), exec, value, proto); + return jsCast(object)->m_targetFunction->hasInstance(exec, value); } JSBoundFunction::JSBoundFunction(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs) -- cgit v1.2.1