Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1903676 - Fix bad rebase. r=me on a CLOSED TREE

Browse Source
This commit is contained in:
Ryan VanderMeulen 2024-09-05 20:35:38 -04:00
parent 8b17fe1fa4
commit 1dcc982064
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/abort/AbortSignal.h
View File

@ -55,22 +55,6 @@ class AbortSignal : public DOMEventTargetHelper, public AbortSignalImpl {
void ThrowIfAborted(JSContext* aCx, ErrorResult& aRv);
<<<<<<< local
// AbortSignalImpl
void SignalAbort(JS::Handle<JS::Value> aReason) override;
// AbortSignalImpl
void SignalAbort(JS::Handle<JS::Value> aReason) override;
// AbortSignalImpl
void SignalAbort(JS::Handle<JS::Value> aReason) override;
||||||| base
// AbortSignalImpl
void SignalAbort(JS::Handle<JS::Value> aReason) override;
=======
>>>>>>> graft
virtual bool IsTaskSignal() const { return false; }
bool Dependent() const;