From b10f7eda6aa6f2b742c2c8f92be0f38ccf473ec9 Mon Sep 17 00:00:00 2001 From: Kent Tamura Date: Fri, 15 Sep 2017 06:45:20 +0000 Subject: [PATCH] A follow-up of RuntimeEnabledFeatures.json5 rename. We renamed RuntiemEnabledFeatures.json5 to runtime_enabled_featurs.json5. This CL updates references to it in comments and documents. Change-Id: I51bd48b6c48ed0e017c53aca9e77971707877269 Reviewed-on: https://chromium-review.googlesource.com/666938 Reviewed-by: Kentaro Hara Reviewed-by: Kinuko Yasuda Commit-Queue: Kent Tamura Cr-Commit-Position: refs/heads/master@{#502175} --- content/public/common/content_switches.cc | 4 ++-- content/shell/test_runner/test_interfaces.cc | 2 +- docs/how_to_add_your_feature_flag.md | 2 +- docs/origin_trials_integration.md | 4 ++-- .../WebKit/LayoutTests/vr/resources/mock-vr-service.js | 2 +- .../WebKit/Source/bindings/IDLExtendedAttributes.md | 8 ++++---- .../WebKit/Source/bindings/IDLExtendedAttributes.txt | 2 +- .../WebKit/Source/core/origin_trials/OriginTrialContext.h | 2 +- third_party/WebKit/Source/platform/OWNERS | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 4cc7c4ec0b69b3..1d6900b895a417 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -112,7 +112,7 @@ const char kDisableBackgroundTimerThrottling[] = "disable-background-timer-throttling"; // Disable one or more Blink runtime-enabled features. -// Use names from RuntimeEnabledFeatures.json5, separated by commas. +// Use names from runtime_enabled_features.json5, separated by commas. // Applied after kEnableBlinkFeatures, and after other flags that change these // features. const char kDisableBlinkFeatures[] = "disable-blink-features"; @@ -347,7 +347,7 @@ const char kEnableBackgroundFetchPersistence[] = "enable-background-fetch-persistence"; // Enable one or more Blink runtime-enabled features. -// Use names from RuntimeEnabledFeatures.json5, separated by commas. +// Use names from runtime_enabled_features.json5, separated by commas. // Applied before kDisableBlinkFeatures, and after other flags that change these // features. const char kEnableBlinkFeatures[] = "enable-blink-features"; diff --git a/content/shell/test_runner/test_interfaces.cc b/content/shell/test_runner/test_interfaces.cc index d7b5356b590234..44c5aaa5ff2334 100644 --- a/content/shell/test_runner/test_interfaces.cc +++ b/content/shell/test_runner/test_interfaces.cc @@ -31,7 +31,7 @@ TestInterfaces::TestInterfaces() main_view_(nullptr) { blink::SetLayoutTestMode(true); // NOTE: please don't put feature specific enable flags here, - // instead add them to RuntimeEnabledFeatures.json5 + // instead add them to runtime_enabled_features.json5 ResetAll(); } diff --git a/docs/how_to_add_your_feature_flag.md b/docs/how_to_add_your_feature_flag.md index a80f1e65a53b1c..5707e686f58faa 100644 --- a/docs/how_to_add_your_feature_flag.md +++ b/docs/how_to_add_your_feature_flag.md @@ -24,7 +24,7 @@ to see [[1](https://chromium-review.googlesource.com/c/554510/8/content/child/runtime_features.cc)] [[2](https://chromium-review.googlesource.com/c/554510/8/third_party/WebKit/public/platform/WebRuntimeFeatures.h)] [[3](https://chromium-review.googlesource.com/c/554510/third_party/WebKit/Source/platform/exported/WebRuntimeFeatures.cpp)] -[[4](https://chromium-review.googlesource.com/c/554510/8/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5)] +[[4](https://chromium-review.googlesource.com/c/554510/8/third_party/WebKit/Source/platform/runtime_enabled_features.json5)] 4. how to use it in blink [[1](https://chromium-review.googlesource.com/c/554510/8/third_party/WebKit/Source/core/workers/WorkerThread.cpp)] diff --git a/docs/origin_trials_integration.md b/docs/origin_trials_integration.md index 90e7ee998d20da..f5c1fb5f4b12f9 100644 --- a/docs/origin_trials_integration.md +++ b/docs/origin_trials_integration.md @@ -9,7 +9,7 @@ changes required. ### Runtime Enabled Features -First, you’ll need to configure [RuntimeEnabledFeatures.json5]. This is +First, you’ll need to configure [runtime\_enabled\_features.json5]. This is explained in the file, but you use `origin_trial_feature_name` to associate your runtime feature flag with a name for your origin trial. The name can be the same as your runtime feature flag, or different. Eventually, this configured @@ -136,5 +136,5 @@ as tests for script-added tokens. For examples, refer to the existing tests in [Developer Guide]: https://github.com/jpchase/OriginTrials/blob/gh-pages/developer-guide.md [OriginTrialEnabled]: /third_party/WebKit/Source/bindings/IDLExtendedAttributes.md#_OriginTrialEnabled_i_m_a_c_ [origin_trials/webexposed]: /third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/ -[RuntimeEnabledFeatures.json5]: /third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5 +[runtime\_enabled\_features.json5]: /third_party/WebKit/Source/platform/runtime_enabled_features.json5 [trial_token_unittest.cc]: /content/common/origin_trials/trial_token_unittest.cc diff --git a/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js b/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js index b6682a831bcb32..cd875235c2d3d0 100644 --- a/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js +++ b/third_party/WebKit/LayoutTests/vr/resources/mock-vr-service.js @@ -69,7 +69,7 @@ class MockVRPresentationProvider { // current execution context finishes. As a workaround, use the alternate // "WebVRExperimentalRendering" mode which works without reentrant calls, // the code only checks for completion on the *next* frame, see the - // corresponding option setting in RuntimeEnabledFeatures.json5. + // corresponding option setting in runtime_enabled_features.json5. this.submitFrameClient_.onSubmitFrameTransferred(); this.submitFrameClient_.onSubmitFrameRendered(); } diff --git a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.md b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.md index 8a044966b940d3..39be0b747c0a36 100644 --- a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.md +++ b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.md @@ -1015,7 +1015,7 @@ Usage: `[NotEnumerable]` can be specified on methods and attributes Summary: Like `[RuntimeEnabled]`, it controls at runtime whether bindings are exposed, but uses a different mechanism for enabling experimental features. -Usage: `[OriginTrialEnabled=FeatureName]`. FeatureName must be included in [RuntimeEnabledFeatures.json5](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5), and is the same value that would be used with `[RuntimeEnabled]`. +Usage: `[OriginTrialEnabled=FeatureName]`. FeatureName must be included in [runtime\_enabled\_features.json5](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/runtime_enabled_features.json5), and is the same value that would be used with `[RuntimeEnabled]`. ```webidl [ @@ -1027,7 +1027,7 @@ When there is an active origin trial for the current execution context, the feat `[OriginTrialEnabled]` has similar semantics to `[RuntimeEnabled]`, and is intended as a drop-in replacement. For example, `[OriginTrialEnabled]` _cannot_ be applied to arguments, see `[RuntimeEnabled]` for reasoning. The key implementation difference is that `[OriginTrialEnabled]` wraps the generated code with `if (OriginTrials::FeatureNameEnabled(...)) { ...code... }`. -For more information, see [RuntimeEnabledFeatures](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5) and [OriginTrialContext](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h). +For more information, see [RuntimeEnabledFeatures](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/runtime_enabled_features.json5) and [OriginTrialContext](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h). *** note **FIXME:** Currently, `[OriginTrialEnabled]` can only be applied to interfaces, attributes, and constants. Methods (including those generated by `iterable`, `setlike`, `maplike`, `serializer` and `stringifier`) are not supported. See [Bug 621641](https://crbug.com/621641). @@ -1218,7 +1218,7 @@ If there is no match, the empty string will be returned. As required by the spec Summary: `[RuntimeEnabled]` wraps the generated code with `if (RuntimeEnabledFeatures::FeatureNameEnabled) { ...code... }`. -Usage: `[RuntimeEnabled=FeatureName]`. FeatureName must be included in [RuntimeEnabledFeatures.in](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5). +Usage: `[RuntimeEnabled=FeatureName]`. FeatureName must be included in [runtime\_enabled\_features.json5](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/runtime_enabled_features.json5). ```webidl [ @@ -1242,7 +1242,7 @@ foo(long x); [RuntimeEnabled=FeatureName] foo(long x, long y); ``` -For more information, see [RuntimeEnabledFeatures](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5). +For more information, see [RuntimeEnabledFeatures](https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/runtime_enabled_features.json5). ### [SaveSameObject] _(a)_ diff --git a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt index 0c933be2a93c2e..65988766c1f87e 100644 --- a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt +++ b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt @@ -89,7 +89,7 @@ ReflectMissing=* ReflectOnly=* Replaceable # Valid values for [RuntimeEnabled] are the Runtime Enabled Features, listed in -# Source/platform/RuntimeEnabledFeatures.json5 +# Source/platform/runtime_enabled_features.json5 RuntimeEnabled=* # Valid values for [RuntimeCallStatsCounter] are counters defined in # Source/platform/bindings/RuntimeCallStats.h diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h index 1d4e15d5c52701..2d52d0208b2a18 100644 --- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h +++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h @@ -25,7 +25,7 @@ class WebTrialTokenValidator; // context. This class is not for direct use by feature implementers. // Instead, the OriginTrials generated namespace provides a method for each // trial to check if it is enabled. Experimental features must be defined in -// RuntimeEnabledFeatures.json5, which is used to generate OriginTrials.h/cpp. +// runtime_enabled_features.json5, which is used to generate OriginTrials.h/cpp. // // Origin trials are defined by string names, provided by the implementers. The // framework does not maintain an enum or constant list for trial names. diff --git a/third_party/WebKit/Source/platform/OWNERS b/third_party/WebKit/Source/platform/OWNERS index 9a83e52be1a10f..f4397b31e781ff 100644 --- a/third_party/WebKit/Source/platform/OWNERS +++ b/third_party/WebKit/Source/platform/OWNERS @@ -22,6 +22,6 @@ wangxianzhu@chromium.org # In addition to the above, API_OWNERS are also adequate reviewers # for adding / changing the status of a feature. -per-file RuntimeEnabledFeatures.json5=file://third_party/WebKit/API_OWNERS +per-file runtime_enabled_features.json5=file://third_party/WebKit/API_OWNERS # COMPONENT: Platform