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/PropertyNameArray.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/PropertyNameArray.h') diff --git a/Source/JavaScriptCore/runtime/PropertyNameArray.h b/Source/JavaScriptCore/runtime/PropertyNameArray.h index 1cdac0049..96f1d0afa 100644 --- a/Source/JavaScriptCore/runtime/PropertyNameArray.h +++ b/Source/JavaScriptCore/runtime/PropertyNameArray.h @@ -52,9 +52,9 @@ namespace JSC { // FIXME: Rename to PropertyNameArrayBuilder. class PropertyNameArray { public: - PropertyNameArray(JSGlobalData* globalData) + PropertyNameArray(VM* vm) : m_data(PropertyNameArrayData::create()) - , m_globalData(globalData) + , m_vm(vm) , m_numCacheableSlots(0) , m_baseObject(0) { @@ -62,17 +62,17 @@ namespace JSC { PropertyNameArray(ExecState* exec) : m_data(PropertyNameArrayData::create()) - , m_globalData(&exec->globalData()) + , m_vm(&exec->vm()) , m_numCacheableSlots(0) , m_baseObject(0) { } - JSGlobalData* globalData() { return m_globalData; } + VM* vm() { return m_vm; } void add(const Identifier& identifier) { add(identifier.impl()); } JS_EXPORT_PRIVATE void add(StringImpl*); - void addKnownUnique(StringImpl* identifier) { m_data->propertyNameVector().append(Identifier(m_globalData, identifier)); } + void addKnownUnique(StringImpl* identifier) { m_data->propertyNameVector().append(Identifier(m_vm, identifier)); } Identifier& operator[](unsigned i) { return m_data->propertyNameVector()[i]; } const Identifier& operator[](unsigned i) const { return m_data->propertyNameVector()[i]; } @@ -106,7 +106,7 @@ namespace JSC { RefPtr m_data; IdentifierSet m_set; - JSGlobalData* m_globalData; + VM* m_vm; size_t m_numCacheableSlots; JSObject* m_baseObject; }; -- cgit v1.2.1