Skip to content

Commit

Permalink
Remove kWebViewSurfaceControlForT
Browse files Browse the repository at this point in the history
The feature flag is not needed anymore and logic around it might cause
a problem.

Bug: 1369719
Change-Id: I287fecb7e98a2cc76cb80eba9a7bbd034ef001e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3926362
Reviewed-by: Bo Liu <boliu@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1053321}
  • Loading branch information
vasilyt authored and Chromium LUCI CQ committed Sep 30, 2022
1 parent f15c2b2 commit 1a56ab9
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions gpu/config/gpu_finch_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ BASE_FEATURE(kWebViewSurfaceControl,
"WebViewSurfaceControl",
base::FEATURE_DISABLED_BY_DEFAULT);

// Same as kWebViewSurfaceControl, but affects only Android T+, used for
// targeting pre-release version.
BASE_FEATURE(kWebViewSurfaceControlForT,
"WebViewSurfaceControlForT",
base::FEATURE_DISABLED_BY_DEFAULT);

// Use thread-safe media path on WebView.
BASE_FEATURE(kWebViewThreadSafeMedia,
"WebViewThreadSafeMedia",
Expand Down Expand Up @@ -547,16 +541,6 @@ bool IsAndroidSurfaceControlEnabled() {

// On WebView we require thread-safe media to use SurfaceControl
if (IsUsingThreadSafeMediaForWebView()) {
// If main feature is not overridden from command line and we're running T+
// use kWebViewSurfaceControlForT to decide feature status instead so we
// can target pre-release android to fish out platform side bugs.
base::FeatureList* feature_list = base::FeatureList::GetInstance();
if ((!feature_list || !feature_list->IsFeatureOverriddenFromCommandLine(
features::kWebViewSurfaceControl.name)) &&
build_info->is_at_least_t()) {
return base::FeatureList::IsEnabled(kWebViewSurfaceControlForT);
}

return base::FeatureList::IsEnabled(kWebViewSurfaceControl);
}

Expand Down

0 comments on commit 1a56ab9

Please sign in to comment.