0

mac: Remove the MacV2GPUSandbox feature flag.

Bug: 915934, 917445
Change-Id: I0974e32001f9406b539577c92f4f91c91f35ad77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2778332
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#865807}
This commit is contained in:
Robert Sesek
2021-03-23 21:01:31 +00:00
committed by Chromium LUCI CQ
parent f80cb307c4
commit 766439c978
8 changed files with 2 additions and 38 deletions

@@ -3635,9 +3635,6 @@ const FeatureEntry kFeatureEntries[] = {
{"mac-syscall-sandbox", flag_descriptions::kMacSyscallSandboxName, {"mac-syscall-sandbox", flag_descriptions::kMacSyscallSandboxName,
flag_descriptions::kMacSyscallSandboxDescription, kOsMac, flag_descriptions::kMacSyscallSandboxDescription, kOsMac,
FEATURE_VALUE_TYPE(features::kMacSyscallSandbox)}, FEATURE_VALUE_TYPE(features::kMacSyscallSandbox)},
{"mac-v2-gpu-sandbox", flag_descriptions::kMacV2GPUSandboxName,
flag_descriptions::kMacV2GPUSandboxDescription, kOsMac,
FEATURE_VALUE_TYPE(features::kMacV2GPUSandbox)},
#endif // OS_MAC #endif // OS_MAC
#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_WIN) || defined(OS_MAC) #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_WIN) || defined(OS_MAC)
{"web-share", flag_descriptions::kWebShareName, {"web-share", flag_descriptions::kWebShareName,

@@ -3715,10 +3715,6 @@ const char kMacSyscallSandboxName[] = "Mac Syscall Filtering Sandbox";
const char kMacSyscallSandboxDescription[] = const char kMacSyscallSandboxDescription[] =
"Controls whether the macOS sandbox filters syscalls."; "Controls whether the macOS sandbox filters syscalls.";
const char kMacV2GPUSandboxName[] = "Mac V2 GPU Sandbox";
const char kMacV2GPUSandboxDescription[] =
"Controls whether the GPU process on macOS uses the V1 or V2 sandbox.";
const char kMetalName[] = "Metal"; const char kMetalName[] = "Metal";
const char kMetalDescription[] = const char kMetalDescription[] =
"Use Metal instead of OpenGL for rasterization (if out-of-process " "Use Metal instead of OpenGL for rasterization (if out-of-process "

@@ -2156,9 +2156,6 @@ extern const char kImmersiveFullscreenDescription[];
extern const char kMacSyscallSandboxName[]; extern const char kMacSyscallSandboxName[];
extern const char kMacSyscallSandboxDescription[]; extern const char kMacSyscallSandboxDescription[];
extern const char kMacV2GPUSandboxName[];
extern const char kMacV2GPUSandboxDescription[];
extern const char kMetalName[]; extern const char kMetalName[];
extern const char kMetalDescription[]; extern const char kMetalDescription[];

@@ -3,7 +3,6 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/command_line.h" #include "base/command_line.h"
#include "base/feature_list.h"
#include "base/metrics/field_trial.h" #include "base/metrics/field_trial.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/posix/global_descriptors.h" #include "base/posix/global_descriptors.h"
@@ -17,7 +16,6 @@
#include "content/grit/content_resources.h" #include "content/grit/content_resources.h"
#include "content/public/browser/child_process_launcher_utils.h" #include "content/public/browser/child_process_launcher_utils.h"
#include "content/public/browser/content_browser_client.h" #include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_paths.h" #include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/result_codes.h" #include "content/public/common/result_codes.h"
@@ -80,10 +78,7 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
command_line_->HasSwitch(sandbox::policy::switches::kNoSandbox) || command_line_->HasSwitch(sandbox::policy::switches::kNoSandbox) ||
sandbox::policy::IsUnsandboxedSandboxType(sandbox_type); sandbox::policy::IsUnsandboxedSandboxType(sandbox_type);
bool use_v2 = (sandbox_type != sandbox::policy::SandboxType::kGpu) || if (!no_sandbox) {
base::FeatureList::IsEnabled(features::kMacV2GPUSandbox);
if (use_v2 && !no_sandbox) {
// Generate the profile string. // Generate the profile string.
std::string profile = std::string profile =
sandbox::policy::SandboxMac::GetSandboxProfile(sandbox_type); sandbox::policy::SandboxMac::GetSandboxProfile(sandbox_type);

@@ -97,10 +97,8 @@
#include "base/message_loop/message_pump_mac.h" #include "base/message_loop/message_pump_mac.h"
#include "components/metal_util/device_removal.h" #include "components/metal_util/device_removal.h"
#include "components/metal_util/test_shader.h" #include "components/metal_util/test_shader.h"
#include "content/public/common/content_features.h"
#include "media/gpu/mac/vt_video_decode_accelerator_mac.h" #include "media/gpu/mac/vt_video_decode_accelerator_mac.h"
#include "sandbox/mac/seatbelt.h" #include "sandbox/mac/seatbelt.h"
#include "sandbox/policy/mac/sandbox_mac.h"
#endif #endif
#if BUILDFLAG(USE_VAAPI) #if BUILDFLAG(USE_VAAPI)
@@ -155,7 +153,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHelper {
#endif #endif
#if defined(OS_MAC) #if defined(OS_MAC)
if (base::FeatureList::IsEnabled(features::kMacV2GPUSandbox)) { {
TRACE_EVENT0("gpu", "Initialize VideoToolbox"); TRACE_EVENT0("gpu", "Initialize VideoToolbox");
media::InitializeVideoToolbox(); media::InitializeVideoToolbox();
} }

@@ -970,9 +970,6 @@ const base::Feature kIOSurfaceCapturer{"IOSurfaceCapturer",
const base::Feature kMacSyscallSandbox{"MacSyscallSandbox", const base::Feature kMacSyscallSandbox{"MacSyscallSandbox",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kMacV2GPUSandbox{"MacV2GPUSandbox",
base::FEATURE_ENABLED_BY_DEFAULT};
// Enables retrying to obtain list of available cameras on Macbooks after // Enables retrying to obtain list of available cameras on Macbooks after
// restarting the video capture service if a previous attempt delivered zero // restarting the video capture service if a previous attempt delivered zero
// cameras. // cameras.

@@ -226,7 +226,6 @@ CONTENT_EXPORT extern const base::Feature kWindowCaptureMacV2;
CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac; CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac;
CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer; CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer;
CONTENT_EXPORT extern const base::Feature kMacSyscallSandbox; CONTENT_EXPORT extern const base::Feature kMacSyscallSandbox;
CONTENT_EXPORT extern const base::Feature kMacV2GPUSandbox;
CONTENT_EXPORT extern const base::Feature kRetryGetVideoCaptureDeviceInfos; CONTENT_EXPORT extern const base::Feature kRetryGetVideoCaptureDeviceInfos;
#endif // defined(OS_MAC) #endif // defined(OS_MAC)

@@ -3982,21 +3982,6 @@
] ]
} }
], ],
"MacV2GPUSandbox": [
{
"platforms": [
"mac"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"MacV2GPUSandbox"
]
}
]
}
],
"ManagedSigninPopup": [ "ManagedSigninPopup": [
{ {
"platforms": [ "platforms": [