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

Bug 1436400 - Part 4: Add ScriptLoader::BytecodeMimeTypeFor static method to get bytecode MIME type for given request. r=nbp

Browse Source 
Module bytecode should use different MIME type, to avoid mixing up script/module
bytecodes for single JS file.

This patch adds a static method that simply returns the current bytecode MIME
type.
The later patch adds a new MIME type for module bytecode and modify the
ScriptLoader::BytecodeMimeTypeFor method to return corresponding MIME type.

Differential Revision: https://phabricator.services.mozilla.com/D140292
This commit is contained in:
Tooru Fujisawa
2022-03-15 19:05:55 +00:00
parent 4750290405
commit 4d4dcd62b7
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/script/ScriptLoadHandler.cpp
View File

@@ -305,7 +305,7 @@ nsresult ScriptLoadHandler::EnsureKnownDataType(
if (cic) {
nsAutoCString altDataType;
cic->GetAlternativeDataType(altDataType);
if (altDataType.Equals(nsContentUtils::JSBytecodeMimeType())) {
if (altDataType.Equals(ScriptLoader::BytecodeMimeTypeFor(mRequest))) {
mRequest->SetBytecode();
TRACE_FOR_TEST(mRequest->mLoadContext->GetScriptElement(),
"scriptloader_load_bytecode");

11
dom/script/ScriptLoader.cpp
View File

@@ -583,7 +583,7 @@ nsresult ScriptLoader::StartLoadInternal(ScriptLoadRequest* aRequest,
return NS_ERROR_FAILURE;
}
// To avoid decoding issues, the build-id is part of the JSBytecodeMimeType
// To avoid decoding issues, the build-id is part of the bytecode MIME type
// constant.
aRequest->mCacheInfo = nullptr;
nsCOMPtr<nsICacheInfoChannel> cic(do_QueryInterface(channel));
@@ -598,7 +598,7 @@ nsresult ScriptLoader::StartLoadInternal(ScriptLoadRequest* aRequest,
// registered.
LOG(("ScriptLoadRequest (%p): Maybe request bytecode", aRequest));
cic->PreferAlternativeDataType(
nsContentUtils::JSBytecodeMimeType(), ""_ns,
BytecodeMimeTypeFor(aRequest), ""_ns,
nsICacheInfoChannel::PreferredAlternativeDataDeliveryType::ASYNC);
} else {
// If we are explicitly loading from the sources, such as after a
@@ -2125,6 +2125,11 @@ nsresult ScriptLoader::CompileOrDecodeClassicScript(
return rv;
}
/* static */
nsCString& ScriptLoader::BytecodeMimeTypeFor(ScriptLoadRequest* aRequest) {
return nsContentUtils::JSBytecodeMimeType();
}
nsresult ScriptLoader::MaybePrepareForBytecodeEncoding(
JS::Handle<JSScript*> aScript, ScriptLoadRequest* aRequest, nsresult aRv) {
bool encodeBytecode = ShouldCacheBytecode(aRequest);
@@ -2362,7 +2367,7 @@ void ScriptLoader::EncodeRequestBytecode(JSContext* aCx,
// case, we just ignore the current one.
nsCOMPtr<nsIAsyncOutputStream> output;
rv = aRequest->mCacheInfo->OpenAlternativeOutputStream(
nsContentUtils::JSBytecodeMimeType(), aRequest->mScriptBytecode.length(),
BytecodeMimeTypeFor(aRequest), aRequest->mScriptBytecode.length(),
getter_AddRefs(output));
if (NS_FAILED(rv)) {
LOG(

2
dom/script/ScriptLoader.h
View File

@@ -557,6 +557,8 @@ class ScriptLoader final : public JS::loader::ScriptLoaderInterface {
JSExecutionContext& aExec,
ScriptLoadRequest* aRequest);
static nsCString& BytecodeMimeTypeFor(ScriptLoadRequest* aRequest);
nsresult MaybePrepareForBytecodeEncoding(JS::Handle<JSScript*> aScript,
ScriptLoadRequest* aRequest,
nsresult aRv);