Commit e2bc03d8 authored by Kagami Sascha Rosylight's avatar Kagami Sascha Rosylight
Browse files

Bug 1861742 - Part 1: Move ReadableByteStreamQueueEntry and PullIntoDescriptor... 

Bug 1861742 - Part 1: Move ReadableByteStreamQueueEntry and PullIntoDescriptor to cpp r=smaug, a=RyanVM

They are not used by other files.

Differential Revision: https://phabricator.services.mozilla.com/D192215
parent c1834554

dom/streams/ReadableByteStreamController.cpp

+138 −0
Original line number Diff line number Diff line
@@ -43,6 +43,144 @@ namespace mozilla::dom { 


using namespace streams_abstract;



// https://streams.spec.whatwg.org/#readable-byte-stream-queue-entry

// Important: These list elements need to be traced by the owning structure.

struct ReadableByteStreamQueueEntry

    : LinkedListElement<RefPtr<ReadableByteStreamQueueEntry>> {

  NS_INLINE_DECL_REFCOUNTING(mozilla::dom::ReadableByteStreamQueueEntry)



  friend class ReadableByteStreamController::cycleCollection;



  ReadableByteStreamQueueEntry(JS::Handle<JSObject*> aBuffer,

                               size_t aByteOffset, size_t aByteLength)

      : LinkedListElement<RefPtr<ReadableByteStreamQueueEntry>>(),

        mBuffer(aBuffer),

        mByteOffset(aByteOffset),

        mByteLength(aByteLength) {}



  JSObject* Buffer() const { return mBuffer; }

  void SetBuffer(JS::Handle<JSObject*> aBuffer) { mBuffer = aBuffer; }



  size_t ByteOffset() const { return mByteOffset; }

  void SetByteOffset(size_t aByteOffset) { mByteOffset = aByteOffset; }



  size_t ByteLength() const { return mByteLength; }

  void SetByteLength(size_t aByteLength) { mByteLength = aByteLength; }



  void ClearBuffer() { mBuffer = nullptr; }



 private:

  // An ArrayBuffer, which will be a transferred version of the one originally

  // supplied by the underlying byte source.

  //

  // This is traced by the list owner (see ReadableByteStreamController's

  // tracing code).

  JS::Heap<JSObject*> mBuffer;



  // A nonnegative integer number giving the byte offset derived from the view

  // originally supplied by the underlying byte source

  size_t mByteOffset = 0;



  // A nonnegative integer number giving the byte length derived from the view

  // originally supplied by the underlying byte source

  size_t mByteLength = 0;



  ~ReadableByteStreamQueueEntry() = default;

};



// Important: These list elments need to be traced by the owning structure.

struct PullIntoDescriptor final

    : LinkedListElement<RefPtr<PullIntoDescriptor>> {

  NS_INLINE_DECL_REFCOUNTING(mozilla::dom::PullIntoDescriptor)



  enum Constructor {

    DataView,

#define DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES(ExternalT, NativeT, Name) Name,

    JS_FOR_EACH_TYPED_ARRAY(DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES)

#undef DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES

  };



  static Constructor constructorFromScalar(JS::Scalar::Type type) {

    switch (type) {

#define REMAP_PULL_INTO_DESCRIPTOR_TYPE(ExternalT, NativeT, Name) \

  case JS::Scalar::Name:                                          \

    return Constructor::Name;

      JS_FOR_EACH_TYPED_ARRAY(REMAP_PULL_INTO_DESCRIPTOR_TYPE)

#undef REMAP



      case JS::Scalar::Int64:

      case JS::Scalar::Simd128:

      case JS::Scalar::MaxTypedArrayViewType:

        break;

    }

    MOZ_CRASH("Unexpected Scalar::Type");

  }



  friend class ReadableByteStreamController::cycleCollection;



  PullIntoDescriptor(JS::Handle<JSObject*> aBuffer, uint64_t aBufferByteLength,

                     uint64_t aByteOffset, uint64_t aByteLength,

                     uint64_t aBytesFilled, uint64_t aElementSize,

                     Constructor aViewConstructor, ReaderType aReaderType)

      : LinkedListElement<RefPtr<PullIntoDescriptor>>(),

        mBuffer(aBuffer),

        mBufferByteLength(aBufferByteLength),

        mByteOffset(aByteOffset),

        mByteLength(aByteLength),

        mBytesFilled(aBytesFilled),

        mElementSize(aElementSize),

        mViewConstructor(aViewConstructor),

        mReaderType(aReaderType) {}



  JSObject* Buffer() const { return mBuffer; }

  void SetBuffer(JS::Handle<JSObject*> aBuffer) { mBuffer = aBuffer; }



  uint64_t BufferByteLength() const { return mBufferByteLength; }

  void SetBufferByteLength(const uint64_t aBufferByteLength) {

    mBufferByteLength = aBufferByteLength;

  }



  uint64_t ByteOffset() const { return mByteOffset; }

  void SetByteOffset(const uint64_t aByteOffset) { mByteOffset = aByteOffset; }



  uint64_t ByteLength() const { return mByteLength; }

  void SetByteLength(const uint64_t aByteLength) { mByteLength = aByteLength; }



  uint64_t BytesFilled() const { return mBytesFilled; }

  void SetBytesFilled(const uint64_t aBytesFilled) {

    mBytesFilled = aBytesFilled;

  }



  uint64_t ElementSize() const { return mElementSize; }

  void SetElementSize(const uint64_t aElementSize) {

    mElementSize = aElementSize;

  }



  Constructor ViewConstructor() const { return mViewConstructor; }



  // Note: Named GetReaderType to avoid name conflict with type.

  ReaderType GetReaderType() const { return mReaderType; }

  void SetReaderType(const ReaderType aReaderType) {

    mReaderType = aReaderType;

  }



  void ClearBuffer() { mBuffer = nullptr; }



 private:

  // This is traced by the list owner (see ReadableByteStreamController's

  // tracing code).

  JS::Heap<JSObject*> mBuffer;

  uint64_t mBufferByteLength = 0;

  uint64_t mByteOffset = 0;

  uint64_t mByteLength = 0;

  uint64_t mBytesFilled = 0;

  uint64_t mElementSize = 0;

  Constructor mViewConstructor;

  ReaderType mReaderType;



  ~PullIntoDescriptor() = default;

};



NS_IMPL_CYCLE_COLLECTION_CLASS(ReadableByteStreamController)

NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ReadableByteStreamController,

                                                ReadableStreamController)

dom/streams/ReadableByteStreamController.h

+0 −138
Original line number Diff line number Diff line
@@ -171,144 +171,6 @@ class ReadableByteStreamController final : public ReadableStreamController, 
  double mStrategyHWM = 0.0;

};



// https://streams.spec.whatwg.org/#readable-byte-stream-queue-entry

// Important: These list elements need to be traced by the owning structure.

struct ReadableByteStreamQueueEntry

    : LinkedListElement<RefPtr<ReadableByteStreamQueueEntry>> {

  NS_INLINE_DECL_REFCOUNTING(mozilla::dom::ReadableByteStreamQueueEntry)



  friend class ReadableByteStreamController::cycleCollection;



  ReadableByteStreamQueueEntry(JS::Handle<JSObject*> aBuffer,

                               size_t aByteOffset, size_t aByteLength)

      : LinkedListElement<RefPtr<ReadableByteStreamQueueEntry>>(),

        mBuffer(aBuffer),

        mByteOffset(aByteOffset),

        mByteLength(aByteLength) {}



  JSObject* Buffer() const { return mBuffer; }

  void SetBuffer(JS::Handle<JSObject*> aBuffer) { mBuffer = aBuffer; }



  size_t ByteOffset() const { return mByteOffset; }

  void SetByteOffset(size_t aByteOffset) { mByteOffset = aByteOffset; }



  size_t ByteLength() const { return mByteLength; }

  void SetByteLength(size_t aByteLength) { mByteLength = aByteLength; }



  void ClearBuffer() { mBuffer = nullptr; }



 private:

  // An ArrayBuffer, which will be a transferred version of the one originally

  // supplied by the underlying byte source.

  //

  // This is traced by the list owner (see ReadableByteStreamController's

  // tracing code).

  JS::Heap<JSObject*> mBuffer;



  // A nonnegative integer number giving the byte offset derived from the view

  // originally supplied by the underlying byte source

  size_t mByteOffset = 0;



  // A nonnegative integer number giving the byte length derived from the view

  // originally supplied by the underlying byte source

  size_t mByteLength = 0;



  ~ReadableByteStreamQueueEntry() = default;

};



// Important: These list elments need to be traced by the owning structure.

struct PullIntoDescriptor final

    : LinkedListElement<RefPtr<PullIntoDescriptor>> {

  NS_INLINE_DECL_REFCOUNTING(mozilla::dom::PullIntoDescriptor)



  enum Constructor {

    DataView,

#define DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES(ExternalT, NativeT, Name) Name,

    JS_FOR_EACH_TYPED_ARRAY(DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES)

#undef DEFINE_TYPED_CONSTRUCTOR_ENUM_NAMES

  };



  static Constructor constructorFromScalar(JS::Scalar::Type type) {

    switch (type) {

#define REMAP_PULL_INTO_DESCRIPTOR_TYPE(ExternalT, NativeT, Name) \

  case JS::Scalar::Name:                                          \

    return Constructor::Name;

      JS_FOR_EACH_TYPED_ARRAY(REMAP_PULL_INTO_DESCRIPTOR_TYPE)

#undef REMAP



      case JS::Scalar::Int64:

      case JS::Scalar::Simd128:

      case JS::Scalar::MaxTypedArrayViewType:

        break;

    }

    MOZ_CRASH("Unexpected Scalar::Type");

  }



  friend class ReadableByteStreamController::cycleCollection;



  PullIntoDescriptor(JS::Handle<JSObject*> aBuffer, uint64_t aBufferByteLength,

                     uint64_t aByteOffset, uint64_t aByteLength,

                     uint64_t aBytesFilled, uint64_t aElementSize,

                     Constructor aViewConstructor, ReaderType aReaderType)

      : LinkedListElement<RefPtr<PullIntoDescriptor>>(),

        mBuffer(aBuffer),

        mBufferByteLength(aBufferByteLength),

        mByteOffset(aByteOffset),

        mByteLength(aByteLength),

        mBytesFilled(aBytesFilled),

        mElementSize(aElementSize),

        mViewConstructor(aViewConstructor),

        mReaderType(aReaderType) {}



  JSObject* Buffer() const { return mBuffer; }

  void SetBuffer(JS::Handle<JSObject*> aBuffer) { mBuffer = aBuffer; }



  uint64_t BufferByteLength() const { return mBufferByteLength; }

  void SetBufferByteLength(const uint64_t aBufferByteLength) {

    mBufferByteLength = aBufferByteLength;

  }



  uint64_t ByteOffset() const { return mByteOffset; }

  void SetByteOffset(const uint64_t aByteOffset) { mByteOffset = aByteOffset; }



  uint64_t ByteLength() const { return mByteLength; }

  void SetByteLength(const uint64_t aByteLength) { mByteLength = aByteLength; }



  uint64_t BytesFilled() const { return mBytesFilled; }

  void SetBytesFilled(const uint64_t aBytesFilled) {

    mBytesFilled = aBytesFilled;

  }



  uint64_t ElementSize() const { return mElementSize; }

  void SetElementSize(const uint64_t aElementSize) {

    mElementSize = aElementSize;

  }



  Constructor ViewConstructor() const { return mViewConstructor; }



  // Note: Named GetReaderType to avoid name conflict with type.

  ReaderType GetReaderType() const { return mReaderType; }

  void SetReaderType(const ReaderType aReaderType) {

    mReaderType = aReaderType;

  }



  void ClearBuffer() { mBuffer = nullptr; }



 private:

  // This is traced by the list owner (see ReadableByteStreamController's

  // tracing code).

  JS::Heap<JSObject*> mBuffer;

  uint64_t mBufferByteLength = 0;

  uint64_t mByteOffset = 0;

  uint64_t mByteLength = 0;

  uint64_t mBytesFilled = 0;

  uint64_t mElementSize = 0;

  Constructor mViewConstructor;

  ReaderType mReaderType;



  ~PullIntoDescriptor() = default;

};



namespace streams_abstract {



MOZ_CAN_RUN_SCRIPT void ReadableByteStreamControllerRespond(