Revert #1137 - Remove unboxed arrays

- accounting for removal of watch()/unwatch()
- updated for intermediate code changes.

1 files changed, 4 insertions, 11 deletions

diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index c774308af..3a3e50244 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -339,19 +339,16 @@ IsObjectValueInCompartment(const Value& v, JSCompartment* comp);
 #endif
 
 // Operations which change an object's dense elements can either succeed, fail,
-// or be unable to complete. The latter is used when the object's elements must
-// become sparse instead. The enum below is used for such operations.
+// or be unable to complete. For native objects, the latter is used when the
+// object's elements must become sparse instead. The enum below is used for
+// such operations, and for similar operations on unboxed arrays and methods
+// that work on both kinds of objects.
 enum class DenseElementResult {
     Failure,
     Success,
     Incomplete
 };
 
-enum class ShouldUpdateTypes {
-    Update,
-    DontUpdate
-};
-
 /*
  * NativeObject specifies the internal implementation of a native object.
  *
@@ -1154,10 +1151,6 @@ class NativeObject : public ShapedObject
         elementsRangeWriteBarrierPost(dstStart, count);
     }
 
-    inline DenseElementResult
-    setOrExtendDenseElements(ExclusiveContext* cx, uint32_t start, const Value* vp, uint32_t count,
-                             ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update);
-
     bool shouldConvertDoubleElements() {
         return getElementsHeader()->shouldConvertDoubleElements();
     }