Commit df83a6f9 authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Commit Bot

Worker: Rename a runtime flag for off-the-main-thread dedicated worker script fetch

Before this CL, kOffMainThreadWorkerScriptFetch has been used as the flag for
off-the-main-thread dedicated worker script fetch. This will be confusing after
a new runtime flag for off-the-main-thread shared worker script fetch is added
by the subsequent CL [1].

To avoid that, this CL renames the flag to
kOffMainThreadDedicatedWorkerScriptFetch. Also, this moves it from blink's
features to base's features to make it aligned with the shared worker's flag
that is also used in content/.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1428624

Bug: 835717
Change-Id: I2981619a4d6f1b1bdd5c4c192db917d1de59db9d
Reviewed-on: https://chromium-review.googlesource.com/c/1438677Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626449}
parent 73013ea3
......@@ -69,6 +69,12 @@ const base::Feature kMojoBlobURLs{"MojoBlobURLs",
const base::Feature kNavigationPredictor{"NavigationPredictor",
base::FEATURE_DISABLED_BY_DEFAULT};
// Enable off-the-main-thread dedicated worker script fetch.
// (https://crbug.com/835717)
const base::Feature kOffMainThreadDedicatedWorkerScriptFetch{
"OffMainThreadDedicatedWorkerScriptFetch",
base::FEATURE_DISABLED_BY_DEFAULT};
// Onion souping for all DOMStorage. https://crbug.com/781870
const base::Feature kOnionSoupDOMStorage{"OnionSoupDOMStorage",
base::FEATURE_ENABLED_BY_DEFAULT};
......
......@@ -27,6 +27,8 @@ BLINK_COMMON_EXPORT extern const base::Feature kLayoutNG;
BLINK_COMMON_EXPORT extern const base::Feature kMixedContentAutoupgrade;
BLINK_COMMON_EXPORT extern const base::Feature kMojoBlobURLs;
BLINK_COMMON_EXPORT extern const base::Feature kNavigationPredictor;
BLINK_COMMON_EXPORT extern const base::Feature
kOffMainThreadDedicatedWorkerScriptFetch;
BLINK_COMMON_EXPORT extern const base::Feature kOnionSoupDOMStorage;
BLINK_COMMON_EXPORT extern const base::Feature kPlzDedicatedWorker;
BLINK_COMMON_EXPORT extern const base::Feature kPortals;
......
......@@ -5,9 +5,11 @@
#include "third_party/blink/renderer/core/workers/dedicated_worker.h"
#include <memory>
#include "base/feature_list.h"
#include "services/network/public/mojom/fetch_api.mojom-blink.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/mojom/interface_provider.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/script/script_type.mojom-blink.h"
#include "third_party/blink/public/mojom/worker/dedicated_worker_factory.mojom-blink.h"
#include "third_party/blink/public/platform/web_content_settings_client.h"
......@@ -214,7 +216,8 @@ void DedicatedWorker::Start() {
if (auto* scope = DynamicTo<WorkerGlobalScope>(*GetExecutionContext()))
scope->EnsureFetcher();
if (RuntimeEnabledFeatures::OffMainThreadWorkerScriptFetchEnabled() ||
if (base::FeatureList::IsEnabled(
features::kOffMainThreadDedicatedWorkerScriptFetch) ||
options_->type() == "module") {
// Specify empty source code here because scripts will be fetched on the
// worker thread.
......
......@@ -5,8 +5,9 @@
#include "third_party/blink/renderer/core/workers/global_scope_creation_params.h"
#include <memory>
#include "base/feature_list.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/renderer/platform/network/content_security_policy_parsers.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
namespace blink {
......@@ -61,7 +62,8 @@ GlobalScopeCreationParams::GlobalScopeCreationParams(
case mojom::ScriptType::kClassic:
if (this->off_main_thread_fetch_option ==
OffMainThreadWorkerScriptFetchOption::kEnabled) {
DCHECK(RuntimeEnabledFeatures::OffMainThreadWorkerScriptFetchEnabled());
DCHECK(base::FeatureList::IsEnabled(
features::kOffMainThreadDedicatedWorkerScriptFetch));
}
break;
case mojom::ScriptType::kModule:
......
......@@ -27,7 +27,9 @@
#include "third_party/blink/renderer/core/workers/worker_global_scope.h"
#include "base/feature_list.h"
#include "base/memory/scoped_refptr.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/web_url_request.h"
#include "third_party/blink/renderer/bindings/core/v8/script_source_code.h"
......@@ -68,7 +70,6 @@
#include "third_party/blink/renderer/platform/loader/fetch/fetch_client_settings_object_snapshot.h"
#include "third_party/blink/renderer/platform/loader/fetch/memory_cache.h"
#include "third_party/blink/renderer/platform/network/content_security_policy_parsers.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
#include "third_party/blink/renderer/platform/scheduler/public/thread_scheduler.h"
#include "third_party/blink/renderer/platform/weborigin/kurl.h"
#include "third_party/blink/renderer/platform/weborigin/security_origin.h"
......@@ -355,7 +356,8 @@ void WorkerGlobalScope::ImportClassicScript(
const KURL& script_url,
FetchClientSettingsObjectSnapshot* outside_settings_object,
const v8_inspector::V8StackTraceId& stack_id) {
DCHECK(RuntimeEnabledFeatures::OffMainThreadWorkerScriptFetchEnabled());
DCHECK(base::FeatureList::IsEnabled(
features::kOffMainThreadDedicatedWorkerScriptFetch));
DCHECK(!IsContextPaused());
// Step 12. "Fetch a classic worker script given url, outside settings,
......@@ -387,7 +389,8 @@ void WorkerGlobalScope::ImportClassicScript(
void WorkerGlobalScope::DidReceiveResponseForClassicScript(
WorkerClassicScriptLoader* classic_script_loader) {
DCHECK(IsContextThread());
DCHECK(RuntimeEnabledFeatures::OffMainThreadWorkerScriptFetchEnabled());
DCHECK(base::FeatureList::IsEnabled(
features::kOffMainThreadDedicatedWorkerScriptFetch));
probe::didReceiveScriptResponse(this, classic_script_loader->Identifier());
}
......@@ -396,7 +399,8 @@ void WorkerGlobalScope::DidImportClassicScript(
WorkerClassicScriptLoader* classic_script_loader,
const v8_inspector::V8StackTraceId& stack_id) {
DCHECK(IsContextThread());
DCHECK(RuntimeEnabledFeatures::OffMainThreadWorkerScriptFetchEnabled());
DCHECK(base::FeatureList::IsEnabled(
features::kOffMainThreadDedicatedWorkerScriptFetch));
// Step 12. "If the algorithm asynchronously completes with null, then:"
if (classic_script_loader->Failed()) {
......
......@@ -887,9 +887,6 @@
{
name: "OffMainThreadCSSPaint",
},
{
name: "OffMainThreadWorkerScriptFetch",
},
{
name: "OffscreenCanvas",
status: "stable",
......
......@@ -667,22 +667,22 @@
{
"prefix": "omt-worker-fetch",
"base": "external/wpt/referrer-policy",
"args": ["--enable-blink-features=OffMainThreadWorkerScriptFetch"]
"args": ["--enable-features=OffMainThreadDedicatedWorkerScriptFetch"]
},
{
"prefix": "omt-worker-fetch",
"base": "external/wpt/workers",
"args": ["--enable-blink-features=OffMainThreadWorkerScriptFetch"]
"args": ["--enable-features=OffMainThreadDedicatedWorkerScriptFetch"]
},
{
"prefix": "omt-worker-fetch",
"base": "fast/workers",
"args": ["--enable-blink-features=OffMainThreadWorkerScriptFetch"]
"args": ["--enable-features=OffMainThreadDedicatedWorkerScriptFetch"]
},
{
"prefix": "omt-worker-fetch",
"base": "http/tests/workers",
"args": ["--enable-blink-features=OffMainThreadWorkerScriptFetch"]
"args": ["--enable-features=OffMainThreadDedicatedWorkerScriptFetch"]
},
{
"prefix": "webrtc-wpt-plan-b",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment