diff options
| author | Boris Zbarsky <bzbarsky@mit.edu> | 2018-04-12 23:26:44 -0400 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:05:25 +0200 |
| commit | 3b4a81565780b724841c2950513416f14ab95ff3 (patch) | |
| tree | 4a79368d1e44d3fa573937edc85256a865e71ad4 /layout/style | |
| parent | ddbe089a628df4b3f818211aacf3b776dfa31dff (diff) | |
| download | UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.gz UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.lz UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.xz UXP-3b4a81565780b724841c2950513416f14ab95ff3.zip | |
Bug 1453339 - Make it harder to mess up Promise::All. r=peterv, a=RyanVM
MozReview-Commit-ID: UO4wssYHj7
Diffstat (limited to 'layout/style')
| -rw-r--r-- | layout/style/FontFaceSet.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp index 59626fba4..550a7d71a 100644 --- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -343,17 +343,7 @@ FontFaceSet::Load(JSContext* aCx, } } - nsIGlobalObject* globalObject = GetParentObject(); - if (!globalObject) { - aRv.Throw(NS_ERROR_FAILURE); - return nullptr; - } - - JS::Rooted<JSObject*> jsGlobal(aCx, globalObject->GetGlobalJSObject()); - GlobalObject global(aCx, jsGlobal); - - RefPtr<Promise> result = Promise::All(global, promises, aRv); - return result.forget(); + return Promise::All(aCx, promises, aRv); } bool |