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/StructureChain.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/JavaScriptCore/runtime/StructureChain.h') diff --git a/Source/JavaScriptCore/runtime/StructureChain.h b/Source/JavaScriptCore/runtime/StructureChain.h index 878f606b4..e652fecc2 100644 --- a/Source/JavaScriptCore/runtime/StructureChain.h +++ b/Source/JavaScriptCore/runtime/StructureChain.h @@ -46,16 +46,16 @@ namespace JSC { public: typedef JSCell Base; - static StructureChain* create(JSGlobalData& globalData, Structure* head) + static StructureChain* create(VM& vm, Structure* head) { - StructureChain* chain = new (NotNull, allocateCell(globalData.heap)) StructureChain(globalData, globalData.structureChainStructure.get()); - chain->finishCreation(globalData, head); + StructureChain* chain = new (NotNull, allocateCell(vm.heap)) StructureChain(vm, vm.structureChainStructure.get()); + chain->finishCreation(vm, head); return chain; } WriteBarrier* head() { return m_vector.get(); } static void visitChildren(JSCell*, SlotVisitor&); - static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) { return Structure::create(globalData, globalObject, prototype, TypeInfo(CompoundType, OverridesVisitChildren), &s_info); } + static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype) { return Structure::create(vm, globalObject, prototype, TypeInfo(CompoundType, OverridesVisitChildren), &s_info); } static ClassInfo s_info; @@ -64,9 +64,9 @@ namespace JSC { static void destroy(JSCell*); protected: - void finishCreation(JSGlobalData& globalData, Structure* head) + void finishCreation(VM& vm, Structure* head) { - Base::finishCreation(globalData); + Base::finishCreation(vm); size_t size = 0; for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure()) ++size; @@ -75,13 +75,13 @@ namespace JSC { size_t i = 0; for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure()) - m_vector[i++].set(globalData, this, current); + m_vector[i++].set(vm, this, current); } private: friend class LLIntOffsetsExtractor; - StructureChain(JSGlobalData&, Structure*); + StructureChain(VM&, Structure*); OwnArrayPtr > m_vector; }; -- cgit v1.2.1