Skip to content

Commit

Permalink
A follow-up of RuntimeEnabledFeatures.json5 rename.
Browse files Browse the repository at this point in the history
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 <haraken@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502175}
  • Loading branch information
tkent-google authored and Commit Bot committed Sep 15, 2017
1 parent 2e317a1 commit b10f7ed
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions content/public/common/content_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion content/shell/test_runner/test_interfaces.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion docs/how_to_add_your_feature_flag.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
4 changes: 2 additions & 2 deletions docs/origin_trials_integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
8 changes: 4 additions & 4 deletions third_party/WebKit/Source/bindings/IDLExtendedAttributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[
Expand All @@ -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).
Expand Down Expand Up @@ -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
[
Expand All @@ -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)_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion third_party/WebKit/Source/platform/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b10f7ed

Please sign in to comment.