summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_base_ui__base__features.cc
diff options
context:
space:
mode:
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.cc17
1 files changed, 13 insertions, 4 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 d9fdcb06fe51..74f63f6db820 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,15 @@
---- ui/base/ui_base_features.cc.orig 2020-05-13 18:40:37 UTC
+--- ui/base/ui_base_features.cc.orig 2020-07-07 21:58:19 UTC
+++ ui/base/ui_base_features.cc
-@@ -121,7 +121,7 @@ const base::Feature kPrecisionTouchpadLogging{
+@@ -98,7 +98,7 @@ const base::Feature kCompositorThreadedScrollbarScroll
+ // native apps on Windows.
+ const base::Feature kExperimentalFlingAnimation {
+ "ExperimentalFlingAnimation",
+-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
+@@ -130,7 +130,7 @@ const base::Feature kPrecisionTouchpadLogging{
"PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // defined(OS_WIN)
@@ -9,7 +18,7 @@
// Enables stylus appearing as touch when in contact with digitizer.
const base::Feature kDirectManipulationStylus = {
"DirectManipulationStylus",
-@@ -131,7 +131,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -140,7 +140,7 @@ const base::Feature kDirectManipulationStylus = {
base::FEATURE_DISABLED_BY_DEFAULT
#endif
};
@@ -18,7 +27,7 @@
// Enables forced colors mode for web content.
const base::Feature kForcedColors{"ForcedColors",
-@@ -157,7 +157,7 @@ bool IsEyeDropperEnabled() {
+@@ -166,7 +166,7 @@ bool IsEyeDropperEnabled() {
// crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the
// Mac launch bug.
const base::Feature kFormControlsRefresh = {"FormControlsRefresh",