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

Bug 1499813 - Part 4: Remove _impl methods, replace with unwrapping. r=tcampbell

Browse Source 
Depends on D9836

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jason Orendorff 2018-10-30 21:59:16 +00:00
parent fd98b1b180
commit 934edc710b
1 changed files with 74 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -951,26 +951,27 @@ ReadableStream::constructor(JSContext* cx, unsigned argc, Value* vp)
}
// Streams spec, 3.2.4.1. get locked
static MOZ_MUST_USE bool
ReadableStream_locked_impl(JSContext* cx, const CallArgs& args)
static bool
ReadableStream_locked(JSContext* cx, unsigned argc, Value* vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
// Step 1: If ! IsReadableStream(this) is false, throw a TypeError exception.
Rooted<ReadableStream*> stream(cx);
stream = &UncheckedUnwrap(&args.thisv().toObject())->as<ReadableStream>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStream",
"get locked",
&stream))
{
return false;
}
// Step 2: Return ! IsReadableStreamLocked(this).
args.rval().setBoolean(stream->locked());
return true;
}
static bool
ReadableStream_locked(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStream(this) is false, throw a TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<IsMaybeWrapped<ReadableStream>, ReadableStream_locked_impl>(cx,
args);
}
// Streams spec, 3.2.4.2. cancel ( reason )
static MOZ_MUST_USE bool
ReadableStream_cancel(JSContext* cx, unsigned argc, Value* vp)
@ -2121,10 +2122,20 @@ ReadableStreamReaderGenericRelease(JSContext* cx, Handle<ReadableStreamReader*>
* another compartment.
*/
static bool
ReadableStreamDefaultReader_releaseLock_impl(JSContext* cx, const CallArgs& args)
ReadableStreamDefaultReader_releaseLock(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultReader(this) is false,
// throw a TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
Rooted<ReadableStreamDefaultReader*> reader(cx);
reader = &UncheckedUnwrap(&args.thisv().toObject())->as<ReadableStreamDefaultReader>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStreamDefaultReader",
"releaseLock",
&reader))
{
return false;
}
// Step 2: If this.[[ownerReadableStream]] is undefined, return.
if (!ReaderHasStream(reader)) {
@ -2149,16 +2160,6 @@ ReadableStreamDefaultReader_releaseLock_impl(JSContext* cx, const CallArgs& args
return ReadableStreamReaderGenericRelease(cx, reader);
}
static bool
ReadableStreamDefaultReader_releaseLock(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultReader(this) is false,
// throw a TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<IsMaybeWrapped<ReadableStreamDefaultReader>,
ReadableStreamDefaultReader_releaseLock_impl>(cx, args);
}
static const JSFunctionSpec ReadableStreamDefaultReader_methods[] = {
JS_FN("cancel", ReadableStreamDefaultReader_cancel, 1, 0),
JS_FN("read", ReadableStreamDefaultReader_read, 0, 0),
@ -2592,11 +2593,21 @@ ReadableStreamControllerGetDesiredSizeUnchecked(ReadableStreamController* contro
// Streams spec, 3.8.4.1. get desiredSize
// and
// Streams spec, 3.10.4.2. get desiredSize
static MOZ_MUST_USE bool
ReadableStreamController_desiredSize_impl(JSContext* cx, const CallArgs& args)
static bool
ReadableStreamDefaultController_desiredSize(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
Rooted<ReadableStreamController*> controller(cx);
controller = &args.thisv().toObject().as<ReadableStreamController>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStreamDefaultController",
"get desiredSize",
&controller))
{
return false;
}
// Streams spec, 3.9.8. steps 1-4.
// 3.9.8. Step 1: Let stream be controller.[[controlledReadableStream]].
@ -2618,16 +2629,7 @@ ReadableStreamController_desiredSize_impl(JSContext* cx, const CallArgs& args)
// Step 2: Return ! ReadableStreamDefaultControllerGetDesiredSize(this).
args.rval().setNumber(ReadableStreamControllerGetDesiredSizeUnchecked(controller));
return true;
}
static bool
ReadableStreamDefaultController_desiredSize(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<Is<ReadableStreamDefaultController>,
ReadableStreamController_desiredSize_impl>(cx, args);
}
static MOZ_MUST_USE bool
@ -2664,15 +2666,22 @@ VerifyControllerStateForClosing(JSContext* cx, Handle<ReadableStreamController*>
/**
* Streams spec, 3.8.4.2 close()
*
* Note: can operate on unwrapped ReadableStreamDefaultController instances from
* another compartment.
*/
static MOZ_MUST_USE bool
ReadableStreamDefaultController_close_impl(JSContext* cx, const CallArgs& args)
static bool
ReadableStreamDefaultController_close(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
Rooted<ReadableStreamDefaultController*> controller(cx);
controller = &args.thisv().toObject().unwrapAs<ReadableStreamDefaultController>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStreamDefaultController",
"close",
&controller))
{
return false;
}
// Steps 2-3.
if (!VerifyControllerStateForClosing(cx, controller)) {
@ -2687,23 +2696,22 @@ ReadableStreamDefaultController_close_impl(JSContext* cx, const CallArgs& args)
return true;
}
// Streams spec, 3.8.4.3. enqueue ( chunk )
static bool
ReadableStreamDefaultController_close(JSContext* cx, unsigned argc, Value* vp)
ReadableStreamDefaultController_enqueue(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<IsMaybeWrapped<ReadableStreamDefaultController>,
ReadableStreamDefaultController_close_impl>(cx, args);
}
// Streams spec, 3.8.4.3. enqueue ( chunk )
static MOZ_MUST_USE bool
ReadableStreamDefaultController_enqueue_impl(JSContext* cx, const CallArgs& args)
{
Rooted<ReadableStreamDefaultController*> controller(cx);
controller = &args.thisv().toObject().unwrapAs<ReadableStreamDefaultController>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStreamDefaultController",
"enqueue",
&controller))
{
return false;
}
// Step 2: If this.[[closeRequested]] is true, throw a TypeError exception.
if (ControllerFlags(controller) & ControllerFlag_CloseRequested) {
@ -2729,27 +2737,25 @@ ReadableStreamDefaultController_enqueue_impl(JSContext* cx, const CallArgs& args
return true;
}
/**
* Streams spec, 3.8.4.4. error ( e )
*/
static bool
ReadableStreamDefaultController_enqueue(JSContext* cx, unsigned argc, Value* vp)
ReadableStreamDefaultController_error(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<IsMaybeWrapped<ReadableStreamDefaultController>,
ReadableStreamDefaultController_enqueue_impl>(cx, args);
}
/**
* Streams spec, 3.8.4.4. error ( e )
*
* Note: can operate on unwrapped ReadableStreamDefaultController instances from
* another compartment.
*/
static MOZ_MUST_USE bool
ReadableStreamDefaultController_error_impl(JSContext* cx, const CallArgs& args)
{
CallArgs args = CallArgsFromVp(argc, vp);
Rooted<ReadableStreamDefaultController*> controller(cx);
controller = &args.thisv().toObject().unwrapAs<ReadableStreamDefaultController>();
if (!UnwrapThisForNonGenericMethod(cx,
args.thisv(),
"ReadableStreamDefaultController",
"enqueue",
&controller))
{
return false;
}
// Step 2: Let stream be this.[[controlledReadableStream]].
// Step 3: If stream.[[state]] is not "readable", throw a TypeError exception.
@ -2767,17 +2773,6 @@ ReadableStreamDefaultController_error_impl(JSContext* cx, const CallArgs& args)
return true;
}
static bool
ReadableStreamDefaultController_error(JSContext* cx, unsigned argc, Value* vp)
{
// Step 1: If ! IsReadableStreamDefaultController(this) is false, throw a
// TypeError exception.
CallArgs args = CallArgsFromVp(argc, vp);
return CallNonGenericMethod<IsMaybeWrapped<ReadableStreamDefaultController>,
ReadableStreamDefaultController_error_impl>(cx, args);
}
static const JSPropertySpec ReadableStreamDefaultController_properties[] = {
JS_PSG("desiredSize", ReadableStreamDefaultController_desiredSize, 0),
JS_PS_END