Commit 00c2091e authored by criss's avatar criss
Browse files

Backed out 3 changesets (bug 1752206, bug 1754088) for causing failures on testReadableStream.cpp 

Backed out changeset bf7e7a03d4bb (bug 1752206)
Backed out changeset e53660b82b9a (bug 1752206)
Backed out changeset 2f006f71ce1e (bug 1754088)
parent 256654ca

browser/config/mozconfigs/linux64/domstreams

+1 −2
Original line number Diff line number Diff line 
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"



# Keep JS Streams working until we are ready to remove it from the tree.

ac_add_options --disable-dom-streams

ac_add_options --enable-dom-streams

ac_add_options --enable-debug



. "$topsrcdir/build/mozconfig.common.override"

dom/streams/ReadableByteStreamController.cpp

+5 −7
Original line number Diff line number Diff line
@@ -1179,10 +1179,6 @@ JSObject* ConstructFromPullIntoConstructor( 
      JS_FOR_EACH_TYPED_ARRAY(CONSTRUCT_TYPED_ARRAY_TYPE)



#undef CONSTRUCT_TYPED_ARRAY_TYPE



    default:

      MOZ_ASSERT_UNREACHABLE("Unknown PullIntoDescriptor::Constructor");

      return nullptr;

  }

}
@@ -1938,9 +1934,11 @@ void SetUpReadableByteStreamController( 
  MOZ_ASSERT(!aStream->Controller());



  // Step 2. If autoAllocateChunkSize is not undefined,

  if (aAutoAllocateChunkSize) {

    // Step 2.1. Assert: ! IsInteger(autoAllocateChunkSize) is true. Implicit

  // Step 2.2. Assert: autoAllocateChunkSize is positive. (Implicit by

  //           type.)

    // Step 2.2. Assert: autoAllocateChunkSize is positive.

    MOZ_ASSERT(*aAutoAllocateChunkSize >= 0);

  }



  // Step 3. Set controller.[[stream]] to stream.

  aController->SetStream(aStream);

dom/streams/ReadableStreamDefaultController.cpp

+0 −4
Original line number Diff line number Diff line
@@ -151,10 +151,6 @@ static bool ReadableStreamDefaultControllerCanCloseOrEnqueueAndThrow( 
    case ReadableStream::ReaderState::Errored:

      aRv.ThrowTypeError(prefix + "has errored."_ns);

      return false;



    default:

      MOZ_ASSERT_UNREACHABLE("Unknown ReaderState");

      return false;

  }

}

dom/streams/ReadableStreamDefaultReader.cpp

+1 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ bool ReadableStreamReaderGenericInitialize(JSContext* aCx, 


      return true;

    // Step 5.

    case ReadableStream::ReaderState::Errored: {

    case ReadableStream::ReaderState::Errored:

      // Step 5.1 Implicit

      // Step 5.2

      JS::RootedValue rootedError(aCx, aStream->StoredError());
@@ -95,10 +95,6 @@ bool ReadableStreamReaderGenericInitialize(JSContext* aCx, 
      aReader->ClosedPromise()->SetSettledPromiseIsHandled();

      return true;

  }

    default:

      MOZ_ASSERT_UNREACHABLE("Unknown ReaderState");

      return false;

  }

}



// https://streams.spec.whatwg.org/#default-reader-constructor &&

taskcluster/ci/build/linux.yml

+1 −1
Original line number Diff line number Diff line
@@ -1845,7 +1845,7 @@ linux64-gcp/opt: 
            - sysroot-wasm32-wasi



linux64-domstreams/debug:

    description: "Linux64 Debug - DOM Streams disabled"

    description: "Linux64 Debug - DOM Streams enabled"

    index:

        product: firefox

        job-name: linux64-domstreams-debug