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

Backed out changeset 4107b758e7ae (bug 1501608) as requested by dev

Browse Source
This commit is contained in:
Dorel Luca
2020-05-02 15:03:19 +03:00
parent c51a93d42b
commit c5e566a917
21 changed files with 156 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/script/ScriptLoadHandler.cpp
View File

@@ -203,7 +203,7 @@ bool ScriptLoadHandler::TrySetDecoder(nsIIncrementalStreamLoader* aLoader,
// request.
nsAutoString hintCharset;
if (!mRequest->IsPreload()) {
mRequest->GetScriptElement()->GetScriptCharset(hintCharset);
mRequest->Element()->GetScriptCharset(hintCharset);
} else {
nsTArray<ScriptLoader::PreloadInfo>::index_type i =
mScriptLoader->mPreloads.IndexOf(
@@ -273,7 +273,7 @@ nsresult ScriptLoadHandler::EnsureKnownDataType(
if (mRequest->IsLoadingSource()) {
mRequest->SetTextSource();
TRACE_FOR_TEST(mRequest->GetScriptElement(), "scriptloader_load_source");
TRACE_FOR_TEST(mRequest->Element(), "scriptloader_load_source");
return NS_OK;
}
@@ -283,8 +283,7 @@ nsresult ScriptLoadHandler::EnsureKnownDataType(
cic->GetAlternativeDataType(altDataType);
if (altDataType.Equals(nsContentUtils::JSBytecodeMimeType())) {
mRequest->SetBytecode();
TRACE_FOR_TEST(mRequest->GetScriptElement(),
"scriptloader_load_bytecode");
TRACE_FOR_TEST(mRequest->Element(), "scriptloader_load_bytecode");
return NS_OK;
}
MOZ_ASSERT(altDataType.IsEmpty());
@@ -298,8 +297,7 @@ nsresult ScriptLoadHandler::EnsureKnownDataType(
if (mimeType.LowerCaseEqualsASCII(APPLICATION_JAVASCRIPT_BINAST)) {
if (mRequest->ShouldAcceptBinASTEncoding()) {
mRequest->SetBinASTSource();
TRACE_FOR_TEST(mRequest->GetScriptElement(),
"scriptloader_load_source");
TRACE_FOR_TEST(mRequest->Element(), "scriptloader_load_source");
return NS_OK;
}
@@ -313,7 +311,7 @@ nsresult ScriptLoadHandler::EnsureKnownDataType(
}
mRequest->SetTextSource();
TRACE_FOR_TEST(mRequest->GetScriptElement(), "scriptloader_load_source");
TRACE_FOR_TEST(mRequest->Element(), "scriptloader_load_source");
MOZ_ASSERT(!mRequest->IsUnknownDataType());
MOZ_ASSERT(mRequest->IsLoading());