summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_base_ui__base__features.cc
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
commita0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch)
tree0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-ui_base_ui__base__features.cc
parentgames/iqpuzzle: Update 1.2.0 -> 1.2.1 (diff)
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
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.cc24
1 files changed, 12 insertions, 12 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 89db3cf50f24..e3e050ba4a56 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig 2020-09-08 19:14:28 UTC
+--- ui/base/ui_base_features.cc.orig 2020-11-13 06:37:05 UTC
+++ ui/base/ui_base_features.cc
-@@ -98,7 +98,7 @@ const base::Feature kCompositorThreadedScrollbarScroll
+@@ -100,7 +100,7 @@ const base::Feature kCompositorThreadedScrollbarScroll
// native apps on Windows.
const base::Feature kExperimentalFlingAnimation {
"ExperimentalFlingAnimation",
@@ -9,30 +9,30 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -130,7 +130,7 @@ const base::Feature kPrecisionTouchpadLogging{
+@@ -132,7 +132,7 @@ const base::Feature kPrecisionTouchpadLogging{
"PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // defined(OS_WIN)
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_CHROMEOS)
// Enables stylus appearing as touch when in contact with digitizer.
const base::Feature kDirectManipulationStylus = {
- "DirectManipulationStylus",
-@@ -140,7 +140,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -143,7 +143,7 @@ const base::Feature kDirectManipulationStylus = {
base::FEATURE_DISABLED_BY_DEFAULT
#endif
};
--#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) ||
++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) ||
+ // defined(OS_CHROMEOS)
// Enables forced colors mode for web content.
- const base::Feature kForcedColors{"ForcedColors",
-@@ -178,7 +178,7 @@ bool IsCSSColorSchemeUARenderingEnabled() {
+@@ -182,7 +182,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",
-#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_MACOSX)
+ defined(OS_APPLE)
base::FEATURE_ENABLED_BY_DEFAULT
#else