зеркало из https://github.com/mozilla/gecko-dev.git
Bug 889146 (part 3) - Rename BufferView as ArrayBufferViewObject. r=sfink.
--HG-- extra : rebase_source : 5aab8be3c4a115d47c68e803044f7f99ffc23021
This commit is contained in:
Nicholas Nethercote
Родитель
1475eae60d
Коммит
8f27c095d6
|
|
@ -269,7 +269,7 @@ ArrayBufferObject::allocateSlots(JSContext *maybecx, uint32_t bytes, uint8_t *co
|
|||
static JSObject *
|
||||
NextView(JSObject *obj)
|
||||
{
|
||||
return static_cast<JSObject*>(obj->getFixedSlot(BufferView::NEXT_VIEW_SLOT).toPrivate());
|
||||
return static_cast<JSObject*>(obj->getFixedSlot(ArrayBufferViewObject::NEXT_VIEW_SLOT).toPrivate());
|
||||
}
|
||||
|
||||
static HeapPtrObject *
|
||||
|
|
@ -501,13 +501,13 @@ WeakObjectSlotBarrierPost(JSObject *obj, size_t slot, const char *desc)
|
|||
static JSObject *
|
||||
BufferLink(JSObject *view)
|
||||
{
|
||||
return static_cast<JSObject*>(view->getFixedSlot(BufferView::NEXT_BUFFER_SLOT).toPrivate());
|
||||
return static_cast<JSObject*>(view->getFixedSlot(ArrayBufferViewObject::NEXT_BUFFER_SLOT).toPrivate());
|
||||
}
|
||||
|
||||
static void
|
||||
SetBufferLink(JSObject *view, JSObject *buffer)
|
||||
{
|
||||
view->setFixedSlot(BufferView::NEXT_BUFFER_SLOT, PrivateValue(buffer));
|
||||
view->setFixedSlot(ArrayBufferViewObject::NEXT_BUFFER_SLOT, PrivateValue(buffer));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -527,14 +527,14 @@ ArrayBufferObject::addView(JSObject *view)
|
|||
// is a strong pointer (it will be marked during tracing.)
|
||||
JS_ASSERT(NextView(view) == NULL);
|
||||
} else {
|
||||
view->setFixedSlot(BufferView::NEXT_VIEW_SLOT, PrivateValue(*views));
|
||||
WeakObjectSlotBarrierPost(view, BufferView::NEXT_VIEW_SLOT, "arraybuffer.nextview");
|
||||
view->setFixedSlot(ArrayBufferViewObject::NEXT_VIEW_SLOT, PrivateValue(*views));
|
||||
WeakObjectSlotBarrierPost(view, ArrayBufferViewObject::NEXT_VIEW_SLOT, "arraybuffer.nextview");
|
||||
|
||||
// Move the multiview buffer list link into this view since we're
|
||||
// prepending it to the list.
|
||||
SetBufferLink(view, BufferLink(*views));
|
||||
SetBufferLink(*views, UNSET_BUFFER_LINK);
|
||||
WeakObjectSlotBarrierPost(view, BufferView::NEXT_BUFFER_SLOT, "view.nextbuffer");
|
||||
WeakObjectSlotBarrierPost(view, ArrayBufferViewObject::NEXT_BUFFER_SLOT, "view.nextbuffer");
|
||||
}
|
||||
|
||||
*views = view;
|
||||
|
|
@ -692,7 +692,7 @@ ArrayBufferObject::obj_trace(JSTracer *trc, JSObject *obj)
|
|||
JSObject *prior = views->get();
|
||||
for (JSObject *view = NextView(prior); view; prior = view, view = NextView(view)) {
|
||||
MarkObjectUnbarriered(trc, &view, "arraybuffer.views");
|
||||
prior->setFixedSlot(BufferView::NEXT_VIEW_SLOT, PrivateValue(view));
|
||||
prior->setFixedSlot(ArrayBufferViewObject::NEXT_VIEW_SLOT, PrivateValue(view));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -751,7 +751,7 @@ ArrayBufferObject::sweep(JSCompartment *compartment)
|
|||
JS_ASSERT(buffer->compartment() == view->compartment());
|
||||
JSObject *nextView = NextView(view);
|
||||
if (!IsObjectAboutToBeFinalized(&view)) {
|
||||
view->setFixedSlot(BufferView::NEXT_VIEW_SLOT, PrivateValue(prevLiveView));
|
||||
view->setFixedSlot(ArrayBufferViewObject::NEXT_VIEW_SLOT, PrivateValue(prevLiveView));
|
||||
prevLiveView = view;
|
||||
}
|
||||
view = nextView;
|
||||
|
|
@ -1340,22 +1340,22 @@ js::ClampDoubleToUint8(const double x)
|
|||
|
||||
/*
|
||||
* This method is used to trace TypedArray and DataView objects. We need a
|
||||
* custom tracer because some of an ArrayBufferView's reserved slots are weak
|
||||
* references, and some need to be updated specially during moving GCs.
|
||||
* custom tracer because some of an ArrayBufferViewObject's reserved slots are
|
||||
* weak references, and some need to be updated specially during moving GCs.
|
||||
*/
|
||||
static void
|
||||
TraceArrayBufferView(JSTracer *trc, JSObject *obj)
|
||||
{
|
||||
HeapSlot &bufSlot = obj->getReservedSlotRef(BufferView::BUFFER_SLOT);
|
||||
HeapSlot &bufSlot = obj->getReservedSlotRef(ArrayBufferViewObject::BUFFER_SLOT);
|
||||
MarkSlot(trc, &bufSlot, "typedarray.buffer");
|
||||
|
||||
/* Update obj's data slot if the array buffer moved. */
|
||||
ArrayBufferObject &buf = bufSlot.toObject().as<ArrayBufferObject>();
|
||||
int32_t offset = obj->getReservedSlot(BufferView::BYTEOFFSET_SLOT).toInt32();
|
||||
int32_t offset = obj->getReservedSlot(ArrayBufferViewObject::BYTEOFFSET_SLOT).toInt32();
|
||||
obj->initPrivate(buf.dataPointer() + offset);
|
||||
|
||||
/* Update NEXT_VEIW_SLOT, if the view moved. */
|
||||
IsSlotMarked(&obj->getReservedSlotRef(BufferView::NEXT_VIEW_SLOT));
|
||||
IsSlotMarked(&obj->getReservedSlotRef(ArrayBufferViewObject::NEXT_VIEW_SLOT));
|
||||
}
|
||||
|
||||
template<typename NativeType> static inline const int TypeIDOfType();
|
||||
|
|
@ -4185,7 +4185,7 @@ JS_GetArrayBufferViewBuffer(JSObject *obj)
|
|||
if (!obj)
|
||||
return NULL;
|
||||
JS_ASSERT(obj->isTypedArray() || obj->is<DataViewObject>());
|
||||
return &obj->getFixedSlot(BufferView::BUFFER_SLOT).toObject();
|
||||
return &obj->getFixedSlot(ArrayBufferViewObject::BUFFER_SLOT).toObject();
|
||||
}
|
||||
|
||||
JS_FRIEND_API(uint32_t)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ typedef Vector<ArrayBufferObject *, 0, SystemAllocPolicy> ArrayBufferVector;
|
|||
//
|
||||
// - JSObject
|
||||
// - ArrayBufferObject
|
||||
// - BufferView
|
||||
// - ArrayBufferViewObject
|
||||
// - DataViewObject
|
||||
// - TypedArray
|
||||
// - TypedArrayTemplate
|
||||
|
|
@ -38,10 +38,10 @@ typedef Vector<ArrayBufferObject *, 0, SystemAllocPolicy> ArrayBufferVector;
|
|||
/*
|
||||
* ArrayBufferObject
|
||||
*
|
||||
* This class holds the underlying raw buffer that the various ArrayBufferView
|
||||
* subclasses (DataView and the TypedArrays) access. It can be created
|
||||
* explicitly and passed to an ArrayBufferView subclass, or can be created
|
||||
* implicitly by constructing a TypedArray with a size.
|
||||
* This class holds the underlying raw buffer that the various
|
||||
* ArrayBufferViewObject subclasses (DataView and the TypedArrays) access. It
|
||||
* can be created explicitly and passed to an ArrayBufferViewObject subclass,
|
||||
* or can be created implicitly by constructing a TypedArray with a size.
|
||||
*/
|
||||
class ArrayBufferObject : public JSObject
|
||||
{
|
||||
|
|
@ -187,13 +187,13 @@ class ArrayBufferObject : public JSObject
|
|||
};
|
||||
|
||||
/*
|
||||
* BufferView
|
||||
* ArrayBufferViewObject
|
||||
*
|
||||
* Common definitions shared by all ArrayBufferViews. (The name ArrayBufferView
|
||||
* is currently being used for a namespace in jsfriendapi.h.)
|
||||
* Common definitions shared by all ArrayBufferViews.
|
||||
*/
|
||||
|
||||
class BufferView : public JSObject {
|
||||
class ArrayBufferViewObject : public JSObject
|
||||
{
|
||||
public:
|
||||
/* Offset of view in underlying ArrayBufferObject */
|
||||
static const size_t BYTEOFFSET_SLOT = 0;
|
||||
|
|
@ -225,7 +225,7 @@ class BufferView : public JSObject {
|
|||
* the subclasses.
|
||||
*/
|
||||
|
||||
struct TypedArray : public BufferView {
|
||||
struct TypedArray : public ArrayBufferViewObject {
|
||||
enum {
|
||||
TYPE_INT8 = 0,
|
||||
TYPE_UINT8,
|
||||
|
|
@ -249,9 +249,9 @@ struct TypedArray : public BufferView {
|
|||
* Typed array properties stored in slots, beyond those shared by all
|
||||
* ArrayBufferViews.
|
||||
*/
|
||||
static const size_t LENGTH_SLOT = BufferView::NUM_SLOTS;
|
||||
static const size_t TYPE_SLOT = BufferView::NUM_SLOTS + 1;
|
||||
static const size_t RESERVED_SLOTS = BufferView::NUM_SLOTS + 2;
|
||||
static const size_t LENGTH_SLOT = ArrayBufferViewObject::NUM_SLOTS;
|
||||
static const size_t TYPE_SLOT = ArrayBufferViewObject::NUM_SLOTS + 1;
|
||||
static const size_t RESERVED_SLOTS = ArrayBufferViewObject::NUM_SLOTS + 2;
|
||||
static const size_t DATA_SLOT = 7; // private slot, based on alloc kind
|
||||
|
||||
static Class classes[TYPE_MAX];
|
||||
|
|
@ -357,7 +357,7 @@ TypedArrayShift(ArrayBufferView::ViewType viewType)
|
|||
MOZ_ASSUME_UNREACHABLE("Unexpected array type");
|
||||
}
|
||||
|
||||
class DataViewObject : public BufferView
|
||||
class DataViewObject : public ArrayBufferViewObject
|
||||
{
|
||||
public:
|
||||
static Class class_;
|
||||
|
|
@ -380,7 +380,7 @@ private:
|
|||
defineGetter(JSContext *cx, PropertyName *name, HandleObject proto);
|
||||
|
||||
public:
|
||||
static const size_t RESERVED_SLOTS = BufferView::NUM_SLOTS;
|
||||
static const size_t RESERVED_SLOTS = ArrayBufferViewObject::NUM_SLOTS;
|
||||
static const size_t DATA_SLOT = 7; // private slot, based on alloc kind
|
||||
|
||||
static inline Value bufferValue(DataViewObject &view);
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
#include "jscntxtinlines.h"
|
||||
#include "jsobjinlines.h"
|
||||
|
||||
// Sentinel value used to initialize ArrayBufferViews' NEXT_BUFFER_SLOTs to
|
||||
// show that they have not yet been added to any ArrayBufferObject list.
|
||||
// Sentinel value used to initialize ArrayBufferViewObjects' NEXT_BUFFER_SLOTs
|
||||
// to show that they have not yet been added to any ArrayBufferObject list.
|
||||
JSObject * const UNSET_BUFFER_LINK = (JSObject*)0x2;
|
||||
|
||||
inline void
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче