corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge mozilla-inbound to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2017-06-27 10:56:41 +02:00
parent 3bcaafc624 3894400fb0
commit 372571d466
680 changed files with 7080 additions and 3945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dom/script/ScriptLoader.cpp
View File

@@ -1050,9 +1050,9 @@ private:
RefPtr<ScriptLoader> mLoader;
RefPtr<ScriptLoadRequest> mRequest;
public:
ScriptRequestProcessor(ScriptLoader* aLoader,
ScriptLoadRequest* aRequest)
: mLoader(aLoader)
ScriptRequestProcessor(ScriptLoader* aLoader, ScriptLoadRequest* aRequest)
: Runnable("dom::ScriptRequestProcessor")
, mLoader(aLoader)
, mRequest(aRequest)
{}
NS_IMETHOD Run() override
@@ -1207,7 +1207,8 @@ ScriptLoader::ProcessScriptElement(nsIScriptElement* aElement)
if (!scriptURI) {
// Asynchronously report the failure to create a URI object
NS_DispatchToCurrentThread(
NewRunnableMethod(aElement,
NewRunnableMethod("nsIScriptElement::FireErrorEvent",
aElement,
&nsIScriptElement::FireErrorEvent));
return false;
}
@@ -1297,7 +1298,8 @@ ScriptLoader::ProcessScriptElement(nsIScriptElement* aElement)
// Asynchronously report the load failure
NS_DispatchToCurrentThread(
NewRunnableMethod(aElement,
NewRunnableMethod("nsIScriptElement::FireErrorEvent",
aElement,
&nsIScriptElement::FireErrorEvent));
return false;
}
@@ -1482,7 +1484,8 @@ class NotifyOffThreadScriptLoadCompletedRunnable : public Runnable
public:
NotifyOffThreadScriptLoadCompletedRunnable(ScriptLoadRequest* aRequest,
ScriptLoader* aLoader)
: mRequest(aRequest)
: Runnable("dom::NotifyOffThreadScriptLoadCompletedRunnable")
, mRequest(aRequest)
, mLoader(aLoader)
, mDocGroup(aLoader->GetDocGroup())
, mToken(nullptr)
@@ -2411,8 +2414,10 @@ void
ScriptLoader::ProcessPendingRequestsAsync()
{
if (HasPendingRequests()) {
nsCOMPtr<nsIRunnable> task = NewRunnableMethod(this,
&ScriptLoader::ProcessPendingRequests);
nsCOMPtr<nsIRunnable> task =
NewRunnableMethod("dom::ScriptLoader::ProcessPendingRequests",
this,
&ScriptLoader::ProcessPendingRequests);
if (mDocument) {
mDocument->Dispatch("ScriptLoader", TaskCategory::Other, task.forget());
} else {