Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1503006 - Part 11: Rename two remaining static methods to toplevel functions. r=tcampbell

Browse Source 
This also reorders the remaining members of class ReadableStream a bit.

Depends on D10435

Differential Revision: https://phabricator.services.mozilla.com/D10436

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jason Orendorff 2018-11-02 21:08:58 +00:00
parent 4474c4783c
commit 2f86eb3f31
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/src/builtin/Stream.cpp
View File

@ -712,6 +712,9 @@ ReadableStream_locked(JSContext* cx, unsigned argc, Value* vp)
return true;
}
static MOZ_MUST_USE JSObject*
ReadableStreamCancel(JSContext* cx, Handle<ReadableStream*> stream, HandleValue reason);
// Streams spec, 3.2.5.2. cancel ( reason )
static MOZ_MUST_USE bool
ReadableStream_cancel(JSContext* cx, unsigned argc, Value* vp)
@ -734,7 +737,7 @@ ReadableStream_cancel(JSContext* cx, unsigned argc, Value* vp)
}
// Step 3: Return ! ReadableStreamCancel(this, reason).
RootedObject cancelPromise(cx, ReadableStream::cancel(cx, stream, args.get(0)));
RootedObject cancelPromise(cx, ::ReadableStreamCancel(cx, stream, args.get(0)));
if (!cancelPromise) {
return false;
}
@ -997,6 +1000,10 @@ TeeReaderReadHandler(JSContext* cx, unsigned argc, Value* vp)
return true;
}
static MOZ_MUST_USE JSObject*
ReadableStreamDefaultReaderRead(JSContext* cx,
Handle<ReadableStreamDefaultReader*> unwrappedReader);
static MOZ_MUST_USE JSObject*
ReadableStreamTee_Pull(JSContext* cx, Handle<TeeState*> unwrappedTeeState)
{
@ -1020,7 +1027,7 @@ ReadableStreamTee_Pull(JSContext* cx, Handle<TeeState*> unwrappedTeeState)
Rooted<ReadableStreamDefaultReader*> unwrappedReader(cx,
&unwrappedReaderObj->as<ReadableStreamDefaultReader>());
RootedObject readPromise(cx, ReadableStreamDefaultReader::read(cx, unwrappedReader));
RootedObject readPromise(cx, ::ReadableStreamDefaultReaderRead(cx, unwrappedReader));
if (!readPromise) {
return nullptr;
}
@ -1101,7 +1108,7 @@ ReadableStreamTee_Cancel(JSContext* cx, Handle<TeeState*> teeState,
Rooted<PromiseObject*> promise(cx, teeState->promise());
// Step b: Let cancelResult be ! ReadableStreamCancel(stream, compositeReason).
RootedObject cancelResult(cx, ReadableStream::cancel(cx, stream, compositeReasonVal));
RootedObject cancelResult(cx, ::ReadableStreamCancel(cx, stream, compositeReasonVal));
{
AutoRealm ar(cx, promise);
if (!cancelResult) {
@ -1337,8 +1344,8 @@ ReadableStreamCloseInternal(JSContext* cx, Handle<ReadableStream*> stream);
* Note: can operate on unwrapped ReadableStream instances from
* another compartment. `reason` must be in the cx compartment.
*/
/* static */ MOZ_MUST_USE JSObject*
ReadableStream::cancel(JSContext* cx, Handle<ReadableStream*> stream, HandleValue reason)
static MOZ_MUST_USE JSObject*
ReadableStreamCancel(JSContext* cx, Handle<ReadableStream*> stream, HandleValue reason)
{
AssertSameCompartment(cx, reason);
@ -1853,7 +1860,7 @@ ReadableStreamDefaultReader_read(JSContext* cx, unsigned argc, Value* vp)
}
// Step 3: Return ! ReadableStreamDefaultReaderRead(this).
JSObject* readPromise = ReadableStreamDefaultReader::read(cx, reader);
JSObject* readPromise = ::ReadableStreamDefaultReaderRead(cx, reader);
if (!readPromise) {
return false;
}
@ -1955,7 +1962,7 @@ ReadableStreamReaderGenericCancel(JSContext* cx, Handle<ReadableStreamReader*> r
}
// Step 3: Return ! ReadableStreamCancel(stream, reason).
return ReadableStream::cancel(cx, stream, reason);
return ::ReadableStreamCancel(cx, stream, reason);
}
/**
@ -2107,9 +2114,9 @@ ReadableStreamControllerPullSteps(JSContext* cx, Handle<ReadableStreamController
* Note: can operate on unwrapped ReadableStreamDefaultReader instances from
* another compartment.
*/
/* static */ MOZ_MUST_USE JSObject*
ReadableStreamDefaultReader::read(JSContext* cx,
Handle<ReadableStreamDefaultReader*> unwrappedReader)
static MOZ_MUST_USE JSObject*
ReadableStreamDefaultReaderRead(JSContext* cx,
Handle<ReadableStreamDefaultReader*> unwrappedReader)
{
// Step 1: Let stream be reader.[[ownerReadableStream]].
// Step 2: Assert: stream is not undefined.
@ -4294,7 +4301,7 @@ JS::ReadableStreamCancel(JSContext* cx, HandleObject streamObj, HandleValue reas
if (!stream)
return nullptr;
return ReadableStream::cancel(cx, stream, reason);
return ::ReadableStreamCancel(cx, stream, reason);
}
JS_PUBLIC_API(bool)
@ -4658,5 +4665,5 @@ JS::ReadableStreamDefaultReaderRead(JSContext* cx, HandleObject readerObj)
if (!reader)
return nullptr;
return js::ReadableStreamDefaultReader::read(cx, reader);
return ::ReadableStreamDefaultReaderRead(cx, reader);
}

29
js/src/builtin/Stream.h
View File

@ -41,6 +41,13 @@ class ReadableStream : public NativeObject
SlotCount
};
enum State {
Readable = 1 << 0,
Closed = 1 << 1,
Errored = 1 << 2,
Disturbed = 1 << 3
};
private:
uint32_t stateBits() const { return getFixedSlot(Slot_State).toInt32(); }
void initStateBits(uint32_t stateBits) { setFixedSlot(Slot_State, Int32Value(stateBits)); }
@ -71,6 +78,11 @@ class ReadableStream : public NativeObject
Value storedError() const { return getFixedSlot(Slot_StoredError); }
void setStoredError(HandleValue value) { setFixedSlot(Slot_StoredError, value); }
JS::ReadableStreamMode mode() const;
uint8_t embeddingFlags() const;
bool locked() const;
public:
static ReadableStream* createDefaultStream(JSContext* cx, HandleValue underlyingSource,
HandleValue size, HandleValue highWaterMark,
@ -78,21 +90,6 @@ class ReadableStream : public NativeObject
static ReadableStream* createExternalSourceStream(JSContext* cx, void* underlyingSource,
uint8_t flags, HandleObject proto = nullptr);
bool locked() const;
JS::ReadableStreamMode mode() const;
uint8_t embeddingFlags() const;
static MOZ_MUST_USE JSObject* cancel(JSContext* cx, Handle<ReadableStream*> stream,
HandleValue reason);
enum State {
Readable = 1 << 0,
Closed = 1 << 1,
Errored = 1 << 2,
Disturbed = 1 << 3
};
private:
static MOZ_MUST_USE ReadableStream* createStream(JSContext* cx, HandleObject proto = nullptr);
@ -156,8 +153,6 @@ class ReadableStreamReader : public NativeObject
class ReadableStreamDefaultReader : public ReadableStreamReader
{
public:
static MOZ_MUST_USE JSObject* read(JSContext* cx, Handle<ReadableStreamDefaultReader*> reader);
static bool constructor(JSContext* cx, unsigned argc, Value* vp);
static const ClassSpec classSpec_;
static const Class class_;