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/JSSegmentedVariableObject.h | |
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/JSSegmentedVariableObject.h')
-rw-r--r-- | Source/JavaScriptCore/runtime/JSSegmentedVariableObject.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/runtime/JSSegmentedVariableObject.h b/Source/JavaScriptCore/runtime/JSSegmentedVariableObject.h index 1fd96c17a..3a6f625ce 100644 --- a/Source/JavaScriptCore/runtime/JSSegmentedVariableObject.h +++ b/Source/JavaScriptCore/runtime/JSSegmentedVariableObject.h @@ -35,7 +35,6 @@ #include "SymbolTable.h" #include <wtf/OwnArrayPtr.h> #include <wtf/SegmentedVector.h> -#include <wtf/UnusedParam.h> namespace JSC { @@ -82,14 +81,14 @@ public: protected: static const unsigned StructureFlags = OverridesVisitChildren | JSSymbolTableObject::StructureFlags; - JSSegmentedVariableObject(JSGlobalData& globalData, Structure* structure, JSScope* scope) - : JSSymbolTableObject(globalData, structure, scope) + JSSegmentedVariableObject(VM& vm, Structure* structure, JSScope* scope) + : JSSymbolTableObject(vm, structure, scope) { } - void finishCreation(JSGlobalData& globalData) + void finishCreation(VM& vm) { - Base::finishCreation(globalData); + Base::finishCreation(vm); } SegmentedVector<WriteBarrier<Unknown>, 16> m_registers; |