зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1505604 - Remove enum class ReaderMode from Stream.cpp. r=tcampbell
Differential Revision: https://phabricator.services.mozilla.com/D11256 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
0aa2d95695
Коммит
1402e1d75e
|
@ -1643,13 +1643,6 @@ ReadableStreamGetNumReadRequests(ReadableStream* stream)
|
|||
return reader->requests()->getDenseInitializedLength();
|
||||
}
|
||||
|
||||
enum class ReaderMode
|
||||
{
|
||||
None,
|
||||
Default,
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
// Streams spec 3.4.12. ReadableStreamHasDefaultReader ( stream )
|
||||
static MOZ_MUST_USE bool
|
||||
ReadableStreamHasDefaultReader(JSContext* cx, Handle<ReadableStream*> stream, bool* result)
|
||||
|
@ -1671,25 +1664,6 @@ ReadableStreamHasDefaultReader(JSContext* cx, Handle<ReadableStream*> stream, bo
|
|||
*result = reader->is<ReadableStreamDefaultReader>();
|
||||
return true;
|
||||
}
|
||||
#endif // DEBUG
|
||||
|
||||
static MOZ_MUST_USE bool
|
||||
ReadableStreamGetReaderMode(JSContext* cx, Handle<ReadableStream*> stream, ReaderMode* mode)
|
||||
{
|
||||
if (!stream->hasReader()) {
|
||||
*mode = ReaderMode::None;
|
||||
return true;
|
||||
}
|
||||
|
||||
Rooted<ReadableStreamReader*> reader(cx);
|
||||
if (!UnwrapReaderFromStream(cx, stream, &reader)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
*mode = ReaderMode::Default;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/*** 3.5. Class ReadableStreamDefaultReader ******************************************************/
|
||||
|
@ -4424,12 +4398,11 @@ JS::ReadableStreamUpdateDataAvailableFromSource(JSContext* cx, JS::HandleObject
|
|||
}
|
||||
|
||||
// Step 8: If ! ReadableStreamHasDefaultReader(stream) is true
|
||||
ReaderMode readerMode;
|
||||
if (!ReadableStreamGetReaderMode(cx, stream, &readerMode)) {
|
||||
bool hasDefaultReader;
|
||||
if (!ReadableStreamHasDefaultReader(cx, stream, &hasDefaultReader)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (readerMode == ReaderMode::Default) {
|
||||
if (hasDefaultReader) {
|
||||
// Step b: Otherwise,
|
||||
// Step i: Assert: controller.[[queue]] is empty.
|
||||
MOZ_ASSERT(oldAvailableData == 0);
|
||||
|
|
Загрузка…
Ссылка в новой задаче