Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1365417 - mozJSComponentLoader::FindTargetObject() is infallible. r=kmag

Browse Source 
MozReview-Commit-ID: Iw4ke16CTKg

--HG--
extra : rebase_source : b2c6f5b0dec1849e1bd814ecdcde78b376ffb8ca
This commit is contained in:
Andrew McCreight 2017-05-16 14:27:50 -07:00
parent f7b4214e05
commit 21f4802365
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/system/OSFileConstants.cpp
View File

@ -1106,8 +1106,7 @@ OSFileConstantsService::Init(JSContext *aCx)
mozJSComponentLoader* loader = mozJSComponentLoader::Get();
JS::Rooted<JSObject*> targetObj(aCx);
rv = loader->FindTargetObject(aCx, &targetObj);
NS_ENSURE_SUCCESS(rv, rv);
loader->FindTargetObject(aCx, &targetObj);
if (!mozilla::DefineOSFileConstants(aCx, targetObj)) {
return NS_ERROR_FAILURE;

6
js/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -438,7 +438,7 @@ mozJSComponentLoader::LoadModule(FileLocation& aFile)
return entry.forget();
}
nsresult
void
mozJSComponentLoader::FindTargetObject(JSContext* aCx,
MutableHandleObject aTargetObject)
{
@ -463,7 +463,6 @@ mozJSComponentLoader::FindTargetObject(JSContext* aCx,
}
aTargetObject.set(targetObject);
return NS_OK;
}
// This requires that the keys be strings and the values be pointers.
@ -987,8 +986,7 @@ mozJSComponentLoader::Import(const nsACString& registryLocation,
PromiseFlatCString(registryLocation).get());
}
} else {
nsresult rv = FindTargetObject(cx, &targetObject);
NS_ENSURE_SUCCESS(rv, rv);
FindTargetObject(cx, &targetObject);
}
Maybe<JSAutoCompartment> ac;

4
js/xpconnect/loader/mozJSComponentLoader.h
View File

@ -47,8 +47,8 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
// ModuleLoader
const mozilla::Module* LoadModule(mozilla::FileLocation& aFile) override;
nsresult FindTargetObject(JSContext* aCx,
JS::MutableHandleObject aTargetObject);
void FindTargetObject(JSContext* aCx,
JS::MutableHandleObject aTargetObject);
static mozJSComponentLoader* Get() { return sSelf; }

3
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View File

@ -606,8 +606,7 @@ mozJSSubScriptLoader::DoLoadSubScriptWithOptions(const nsAString& url,
RootedObject targetObj(cx);
mozJSComponentLoader* loader = mozJSComponentLoader::Get();
rv = loader->FindTargetObject(cx, &targetObj);
NS_ENSURE_SUCCESS(rv, rv);
loader->FindTargetObject(cx, &targetObj);
// We base reusingGlobal off of what the loader told us, but we may not
// actually be using that object.

3
toolkit/components/ctypes/ctypes.cpp
View File

@ -115,8 +115,7 @@ Module::Call(nsIXPConnectWrappedNative* wrapper,
{
mozJSComponentLoader* loader = mozJSComponentLoader::Get();
JS::Rooted<JSObject*> targetObj(cx);
nsresult rv = loader->FindTargetObject(cx, &targetObj);
NS_ENSURE_SUCCESS(rv, rv);
loader->FindTargetObject(cx, &targetObj);
*_retval = InitAndSealCTypesClass(cx, targetObj);
return NS_OK;

3
toolkit/components/perf/PerfMeasurement.cpp
View File

@ -84,8 +84,7 @@ Module::Call(nsIXPConnectWrappedNative* wrapper,
mozJSComponentLoader* loader = mozJSComponentLoader::Get();
JS::Rooted<JSObject*> targetObj(cx);
nsresult rv = loader->FindTargetObject(cx, &targetObj);
NS_ENSURE_SUCCESS(rv, rv);
loader->FindTargetObject(cx, &targetObj);
*_retval = InitAndSealPerfMeasurementClass(cx, targetObj);
return NS_OK;