diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
| commit | d7df65954a585e97ccee21fa9cb50cb116efddcc (patch) | |
| tree | 9ed9a1f46f5d2e8373dcab553bad55b54bb8103b /layout/style | |
| parent | ba71cc45fef6dfaecef8f5edf65ce1f1ff457624 (diff) | |
| parent | 9135a11e8c8f0837738fd976b28d36a53fd1de27 (diff) | |
| download | UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.gz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.lz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.xz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.zip | |
Merge branch 'ported-upstream'
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 |