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

Bug 1742437 - move mLineNo from ScriptLoadRequest to DOMScriptLoadContext; r=jonco,smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D136745
This commit is contained in:
Yulia Startsev
2022-02-21 15:39:06 +00:00
parent b58fcd4a44
commit a06220c638
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/script/ScriptLoader.cpp
View File

@@ -1441,7 +1441,7 @@ bool ScriptLoader::ProcessInlineScript(nsIScriptElement* aElement,
SRIMetadata(), // SRI doesn't apply
referrerPolicy);
request->GetLoadContext()->mIsInline = true;
request->mLineNo = aElement->GetScriptLineNumber();
request->GetLoadContext()->mLineNo = aElement->GetScriptLineNumber();
request->mProgress = ScriptLoadRequest::Progress::eLoading_Source;
request->SetTextSource();
TRACE_FOR_TEST_BOOL(request->GetLoadContext()->GetScriptElement(),
@@ -2117,7 +2117,7 @@ void ScriptLoader::FireScriptAvailable(nsresult aResult,
obs->ScriptAvailable(aResult,
aRequest->GetLoadContext()->GetScriptElement(),
aRequest->GetLoadContext()->mIsInline, aRequest->mURI,
aRequest->mLineNo);
aRequest->GetLoadContext()->mLineNo);
}
aRequest->GetLoadContext()->FireScriptAvailable(aResult);
@@ -2200,7 +2200,8 @@ nsresult ScriptLoader::FillCompileOptionsForRequest(
}
aOptions->setIntroductionInfoToCaller(aCx, introductionType,
aIntroductionScript);
aOptions->setFileAndLine(aRequest->mURL.get(), aRequest->mLineNo);
aOptions->setFileAndLine(aRequest->mURL.get(),
aRequest->GetLoadContext()->mLineNo);
aOptions->setIsRunOnce(true);
aOptions->setNoScriptRval(true);
if (aRequest->mSourceMapURL) {