Move some content_switches into blink.
These switches will be used inside blink when the LayerTreeSettings
are created solely in blink (instead of at the content layer). In order
to do that we have to move some switches first.
BUG=1097816
Change-Id: I5771d65c454dd6bb276270f90f1f8f7df556ee65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2260938
Reviewed-by: Wez <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Commit-Queue: Dave Tapuska <[email protected]>
Cr-Commit-Position: refs/heads/master@{#782444}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 353cac3..fdec331 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -165,6 +165,7 @@
#include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/forcedark/forcedark_switches.h"
+#include "third_party/blink/public/common/switches.h"
#include "third_party/leveldatabase/leveldb_features.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/accessibility_switches.h"
@@ -2500,8 +2501,8 @@
#endif // OS_ANDROID
{"enable-zero-copy", flag_descriptions::kZeroCopyName,
flag_descriptions::kZeroCopyDescription, kOsAll,
- ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy,
- switches::kDisableZeroCopy)},
+ ENABLE_DISABLE_VALUE_TYPE(blink::switches::kEnableZeroCopy,
+ blink::switches::kDisableZeroCopy)},
{"enable-vulkan", flag_descriptions::kEnableVulkanName,
flag_descriptions::kEnableVulkanDescription,
kOsWin | kOsLinux | kOsAndroid, FEATURE_VALUE_TYPE(features::kVulkan)},
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 137fb6571..e54c8c8a 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -48,6 +48,7 @@
#include "media/capture/capture_switches.h"
#include "media/media_buildflags.h"
#include "services/service_manager/sandbox/switches.h"
+#include "third_party/blink/public/common/switches.h"
#include "third_party/cros_system_api/switches/chrome_switches.h"
#include "ui/base/ui_base_switches.h"
#include "ui/display/display_switches.h"
@@ -99,32 +100,25 @@
::switches::kDisableGpuWatchdog,
::switches::kDisableGpuCompositing,
::switches::kDisableGpuRasterization,
- ::switches::kDisableLowResTiling,
::switches::kDisableOopRasterization,
- ::switches::kDisablePartialRaster,
::switches::kDisablePepper3DImageChromium,
::switches::kDisablePreferCompositingToLCDText,
- ::switches::kDisableRGBA4444Textures,
::switches::kDisableThreadedScrolling,
::switches::kDisableTouchDragDrop,
::switches::kDisableVideoCaptureUseGpuMemoryBuffer,
::switches::kDisableYUVImageDecoding,
- ::switches::kDisableZeroCopy,
::switches::kEnableBlinkFeatures,
::switches::kEnableGpuMemoryBufferVideoFrames,
::switches::kEnableGpuRasterization,
::switches::kEnableLogging,
- ::switches::kEnableLowResTiling,
::switches::kEnableNativeGpuMemoryBuffers,
::switches::kEnableOopRasterization,
::switches::kEnablePreferCompositingToLCDText,
- ::switches::kEnableRGBA4444Textures,
::switches::kEnableTouchDragDrop,
::switches::kEnableUnifiedDesktop,
::switches::kEnableUseHDRTransferFunction,
::switches::kEnableUseZoomForDSF,
::switches::kEnableViewport,
- ::switches::kEnableZeroCopy,
::switches::kEnableHardwareOverlays,
::switches::kEdgeTouchFiltering,
#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
@@ -134,7 +128,6 @@
::switches::kMainFrameResizesAreOrientationChanges,
::switches::kForceDeviceScaleFactor,
::switches::kForceGpuMemAvailableMb,
- ::switches::kGpuRasterizationMSAASampleCount,
::switches::kGpuStartupDialog,
::switches::kGpuSandboxStartEarly,
::switches::kNumRasterThreads,
@@ -173,6 +166,14 @@
ash::switches::kAuraLegacyPowerButton,
ash::switches::kEnableDimShelf,
ash::switches::kShowTaps,
+ blink::switches::kDisableLowResTiling,
+ blink::switches::kDisablePartialRaster,
+ blink::switches::kDisableRGBA4444Textures,
+ blink::switches::kDisableZeroCopy,
+ blink::switches::kEnableLowResTiling,
+ blink::switches::kEnableRGBA4444Textures,
+ blink::switches::kEnableZeroCopy,
+ blink::switches::kGpuRasterizationMSAASampleCount,
chromeos::switches::kDefaultWallpaperLarge,
chromeos::switches::kDefaultWallpaperSmall,
chromeos::switches::kGuestWallpaperLarge,
