diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/runtime/CommonIdentifiers.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/runtime/CommonIdentifiers.cpp')
| -rw-r--r-- | Source/JavaScriptCore/runtime/CommonIdentifiers.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |