diff options
Diffstat (limited to 'www/chromium/files/patch-ui_base_ui__base__features.cc')
| -rw-r--r-- | www/chromium/files/patch-ui_base_ui__base__features.cc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 56e299361bf2..aba7495b5d34 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,15 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2021-01-18 21:29:48 UTC +--- ui/base/ui_base_features.cc.orig 2021-03-12 23:57:48 UTC +++ ui/base/ui_base_features.cc -@@ -109,7 +109,7 @@ const base::Feature kCompositorThreadedScrollbarScroll - const base::Feature kExperimentalFlingAnimation { +@@ -115,7 +115,7 @@ const base::Feature kExperimentalFlingAnimation { "ExperimentalFlingAnimation", - #if defined(OS_WIN) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++#if defined(OS_WIN) || defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ + !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -141,7 +141,7 @@ const base::Feature kPrecisionTouchpadLogging{ +@@ -148,7 +148,7 @@ const base::Feature kPrecisionTouchpadLogging{ "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_WIN) @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { -@@ -152,7 +152,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -159,7 +159,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; @@ -27,7 +27,16 @@ // defined(OS_CHROMEOS) // Enables forced colors mode for web content. -@@ -198,7 +198,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { +@@ -193,7 +193,7 @@ bool IsEyeDropperEnabled() { + // crbug.com/1086530 for the Desktop launch bug. + const base::Feature kCSSColorSchemeUARendering = { + "CSSColorSchemeUARendering", +-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_APPLE) + base::FEATURE_ENABLED_BY_DEFAULT + #else +@@ -212,7 +212,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the // Mac launch bug. const base::Feature kFormControlsRefresh = {"FormControlsRefresh", |