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/CommonIdentifiers.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/CommonIdentifiers.cpp') diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp index e929d7a49..e19df1c64 100644 --- a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp +++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp @@ -23,15 +23,15 @@ namespace JSC { -#define INITIALIZE_PROPERTY_NAME(name) , name(globalData, #name) -#define INITIALIZE_KEYWORD(name) , name##Keyword(globalData, #name) +#define INITIALIZE_PROPERTY_NAME(name) , name(vm, #name) +#define INITIALIZE_KEYWORD(name) , name##Keyword(vm, #name) -CommonIdentifiers::CommonIdentifiers(JSGlobalData* globalData) +CommonIdentifiers::CommonIdentifiers(VM* vm) : nullIdentifier() , emptyIdentifier(Identifier::EmptyIdentifier) - , underscoreProto(globalData, "__proto__") - , thisIdentifier(globalData, "this") - , useStrictIdentifier(globalData, "use strict") + , underscoreProto(vm, "__proto__") + , thisIdentifier(vm, "this") + , useStrictIdentifier(vm, "use strict") JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD) JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME) { -- cgit v1.2.1