diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-20 17:46:46 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-11 08:40:35 +0100 |
| commit | 254cf16ed4c6007a59a7cd5d64bb621430b3c01d (patch) | |
| tree | 7330fcef5dbd63ba2809d4e8fd3449a673c327f9 /src/qml/jsruntime/qv4objectproto.cpp | |
| parent | 7cfc07ae1bf4ccbec109f52195ef824a3ea4dc21 (diff) | |
Fix Object::arrayData() accessor to return a heap object
Change-Id: Iffc82c2f415251d73bb7446848399b54b16589c9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 585c773c6b..46116cb707 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -250,9 +250,9 @@ ReturnedValue ObjectPrototype::method_seal(CallContext *ctx) if (o->arrayData()) { ArrayData::ensureAttributes(o.getPointer()); - for (uint i = 0; i < o->arrayData()->alloc(); ++i) { + for (uint i = 0; i < o->d()->arrayData->alloc; ++i) { if (!o->arrayData()->isEmpty(i)) - o->arrayData()->attrs()[i].setConfigurable(false); + o->d()->arrayData->attrs[i].setConfigurable(false); } } @@ -275,11 +275,11 @@ ReturnedValue ObjectPrototype::method_freeze(CallContext *ctx) if (o->arrayData()) { ArrayData::ensureAttributes(o.getPointer()); - for (uint i = 0; i < o->arrayData()->alloc(); ++i) { + for (uint i = 0; i < o->arrayData()->alloc; ++i) { if (!o->arrayData()->isEmpty(i)) - o->arrayData()->attrs()[i].setConfigurable(false); - if (o->arrayData()->attrs()[i].isData()) - o->arrayData()->attrs()[i].setWritable(false); + o->arrayData()->attrs[i].setConfigurable(false); + if (o->arrayData()->attrs[i].isData()) + o->arrayData()->attrs[i].setWritable(false); } } return o.asReturnedValue(); @@ -313,10 +313,10 @@ ReturnedValue ObjectPrototype::method_isSealed(CallContext *ctx) return Encode(true); Q_ASSERT(o->arrayData() && o->arrayData()->length()); - if (!o->arrayData()->attrs()) + if (!o->arrayData()->attrs) return Encode(false); - for (uint i = 0; i < o->arrayData()->alloc(); ++i) { + for (uint i = 0; i < o->arrayData()->alloc; ++i) { if (!o->arrayData()->isEmpty(i)) if (o->arrayData()->attributes(i).isConfigurable()) return Encode(false); @@ -342,10 +342,10 @@ ReturnedValue ObjectPrototype::method_isFrozen(CallContext *ctx) return Encode(true); Q_ASSERT(o->arrayData() && o->arrayData()->length()); - if (!o->arrayData()->attrs()) + if (!o->arrayData()->attrs) return Encode(false); - for (uint i = 0; i < o->arrayData()->alloc(); ++i) { + for (uint i = 0; i < o->arrayData()->alloc; ++i) { if (!o->arrayData()->isEmpty(i)) if (o->arrayData()->attributes(i).isConfigurable() || o->arrayData()->attributes(i).isWritable()) return Encode(false); |