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

Bug 1510717 - Part 2: Remove unused flag ReadableStreamController::Flag_TeeBranch. r=jwalden

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D13294

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jason Orendorff 2018-12-04 19:55:13 +00:00
parent dcbc1a2506
commit 5e251da382
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,12 +385,10 @@ class TeeState : public NativeObject {
&getFixedSlot(Slot_Branch1)
.toObject()
.as<ReadableStreamDefaultController>();
MOZ_ASSERT(controller->flags() & ReadableStreamController::Flag_TeeBranch);
MOZ_ASSERT(controller->isTeeBranch1());
return controller;
}
void setBranch1(ReadableStreamDefaultController* controller) {
MOZ_ASSERT(controller->flags() & ReadableStreamController::Flag_TeeBranch);
MOZ_ASSERT(controller->isTeeBranch1());
setFixedSlot(Slot_Branch1, ObjectValue(*controller));
}
@ -400,12 +398,10 @@ class TeeState : public NativeObject {
&getFixedSlot(Slot_Branch2)
.toObject()
.as<ReadableStreamDefaultController>();
MOZ_ASSERT(controller->flags() & ReadableStreamController::Flag_TeeBranch);
MOZ_ASSERT(controller->isTeeBranch2());
return controller;
}
void setBranch2(ReadableStreamDefaultController* controller) {
MOZ_ASSERT(controller->flags() & ReadableStreamController::Flag_TeeBranch);
MOZ_ASSERT(controller->isTeeBranch2());
setFixedSlot(Slot_Branch2, ObjectValue(*controller));
}

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

@ -265,11 +265,10 @@ class ReadableStreamController : public StreamController {
Flag_Pulling = 1 << 1,
Flag_PullAgain = 1 << 2,
Flag_CloseRequested = 1 << 3,
Flag_TeeBranch = 1 << 4,
Flag_TeeBranch1 = 1 << 5,
Flag_TeeBranch2 = 1 << 6,
Flag_ExternalSource = 1 << 7,
Flag_SourceLocked = 1 << 8,
Flag_TeeBranch1 = 1 << 4,
Flag_TeeBranch2 = 1 << 5,
Flag_ExternalSource = 1 << 6,
Flag_SourceLocked = 1 << 7,
};
ReadableStream* stream() const {
@ -315,9 +314,15 @@ class ReadableStreamController : public StreamController {
bool closeRequested() const { return flags() & Flag_CloseRequested; }
void setCloseRequested() { addFlags(Flag_CloseRequested); }
bool isTeeBranch1() const { return flags() & Flag_TeeBranch1; }
void setTeeBranch1() { addFlags(Flag_TeeBranch | Flag_TeeBranch1); }
void setTeeBranch1() {
MOZ_ASSERT(!isTeeBranch2());
addFlags(Flag_TeeBranch1);
}
bool isTeeBranch2() const { return flags() & Flag_TeeBranch2; }
void setTeeBranch2() { addFlags(Flag_TeeBranch | Flag_TeeBranch2); }
void setTeeBranch2() {
MOZ_ASSERT(!isTeeBranch1());
addFlags(Flag_TeeBranch2);
}
bool hasExternalSource() const { return flags() & Flag_ExternalSource; }
bool sourceLocked() const { return flags() & Flag_SourceLocked; }
void setSourceLocked() { addFlags(Flag_SourceLocked); }