Commit 631930c2 authored by Matthew Gaudet's avatar Matthew Gaudet
Browse files

Bug 1769649 - Remove duplicated definition of ReadableStreamReaderMode in JS... 

Bug 1769649 - Remove duplicated definition of ReadableStreamReaderMode in JS Streams implementation r=bthrall

Differential Revision: https://phabricator.services.mozilla.com/D146510
parent 160c12d0

js/public/Stream.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ extern JS_PUBLIC_API bool ReadableStreamGetMode(JSContext* cx, 
                                                HandleObject stream,

                                                ReadableStreamMode* mode);



enum class ReadableStreamReaderMode { Default };

enum class ReadableStreamReaderMode { Default, Byob };



/**

 * Returns true if the given ReadableStream is readable, false if not.

js/src/builtin/streams/ReadableStream.cpp

+3 −5
Original line number Diff line number Diff line
@@ -273,8 +273,6 @@ bool ReadableStream::constructor(JSContext* cx, unsigned argc, JS::Value* vp) { 
//

// Not implemented.



enum class ReadableStreamReaderMode { Byob };



/**

 * https://streams.spec.whatwg.org/#rs-get-reader

 * ReadableStreamReader getReader(optional ReadableStreamGetReaderOptions
@@ -303,7 +301,7 @@ enum class ReadableStreamReaderMode { Byob }; 
    return false;

  }



  Maybe<ReadableStreamReaderMode> mode;

  Maybe<JS::ReadableStreamReaderMode> mode;

  // Step 4: ...

  //

  // - Optimized for one dictionary member.
@@ -339,7 +337,7 @@ enum class ReadableStreamReaderMode { Byob }; 
        return false;

      }



      mode = Some(ReadableStreamReaderMode::Byob);

      mode = Some(JS::ReadableStreamReaderMode::Byob);

    }

  }
@@ -351,7 +349,7 @@ enum class ReadableStreamReaderMode { Byob }; 
                                               ForAuthorCodeBool::Yes);

  } else {

    // Step 2: Assert: options["mode"] is "byob".

    MOZ_ASSERT(mode.value() == ReadableStreamReaderMode::Byob);

    MOZ_ASSERT(mode.value() == JS::ReadableStreamReaderMode::Byob);



    // Step 3: Return ? AcquireReadableStreamBYOBReader(this).

    reader = CreateReadableStreamBYOBReader(cx, unwrappedStream,