From 2e2ba8ff45915f40ed3e014101269c175f2a89a0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Aug 2012 08:29:43 +0200 Subject: Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 (http://svn.webkit.org/repository/webkit/trunk@126545) New snapshot with clang and python build fixes --- Source/JavaScriptCore/runtime/Operations.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/runtime/Operations.h') diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h index 497b19d82..88fffdac4 100644 --- a/Source/JavaScriptCore/runtime/Operations.h +++ b/Source/JavaScriptCore/runtime/Operations.h @@ -31,7 +31,7 @@ namespace JSC { NEVER_INLINE JSValue jsAddSlowCase(CallFrame*, JSValue, JSValue); JSValue jsTypeStringForValue(CallFrame*, JSValue); - bool jsIsObjectType(JSValue); + bool jsIsObjectType(CallFrame*, JSValue); bool jsIsFunctionType(JSValue); ALWAYS_INLINE JSValue jsString(ExecState* exec, JSString* s1, JSString* s2) @@ -134,13 +134,13 @@ namespace JSC { return true; if (!v2.isCell()) return false; - return v2.asCell()->structure()->typeInfo().masqueradesAsUndefined(); + return v2.asCell()->structure()->masqueradesAsUndefined(exec->lexicalGlobalObject()); } if (v2.isUndefinedOrNull()) { if (!v1.isCell()) return false; - return v1.asCell()->structure()->typeInfo().masqueradesAsUndefined(); + return v1.asCell()->structure()->masqueradesAsUndefined(exec->lexicalGlobalObject()); } if (v1.isObject()) { -- cgit v1.2.1