From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp') diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index 1010ad2b7..0efaf84bc 100644 --- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -34,6 +34,7 @@ #include "Lexer.h" #include "LiteralParser.h" #include "Nodes.h" +#include "Operations.h" #include "Parser.h" #include #include @@ -363,7 +364,7 @@ static double jsHexIntegerLiteral(const CharType*& data, const CharType* end) template static double jsStrDecimalLiteral(const CharType*& data, const CharType* end) { - ASSERT(data < end); + RELEASE_ASSERT(data < end); size_t parsedLength; double number = parseDouble(data, end - data, parsedLength); @@ -514,7 +515,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncEval(ExecState* exec) } JSGlobalObject* calleeGlobalObject = exec->callee()->globalObject(); - EvalExecutable* eval = EvalExecutable::create(exec, makeSource(s), false); + EvalExecutable* eval = EvalExecutable::create(exec, exec->vm().codeCache(), makeSource(s), false); JSObject* error = eval->compile(exec, calleeGlobalObject); if (error) return throwVMError(exec, error); @@ -559,13 +560,13 @@ EncodedJSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec) EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec) { - return JSValue::encode(jsBoolean(isnan(exec->argument(0).toNumber(exec)))); + return JSValue::encode(jsBoolean(std::isnan(exec->argument(0).toNumber(exec)))); } EncodedJSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec) { double n = exec->argument(0).toNumber(exec); - return JSValue::encode(jsBoolean(isfinite(n))); + return JSValue::encode(jsBoolean(std::isfinite(n))); } EncodedJSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec) @@ -735,7 +736,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec) if (!thisObject->isExtensible()) return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError)); - if (!thisObject->setPrototypeWithCycleCheck(exec->globalData(), value)) + if (!thisObject->setPrototypeWithCycleCheck(exec->vm(), value)) throwError(exec, createError(exec, "cyclic __proto__ value")); return JSValue::encode(jsUndefined()); } -- cgit v1.2.1