Skip to content

Commit

Permalink
Move experimental fling animation flag to ui
Browse files Browse the repository at this point in the history
Currently, this feature flag exists in content. In master CL
https://chromium-review.googlesource.com/c/chromium/src/+/1773872, this
feature flag is utilized in CreateFromDefaultPlatformCurve to decide
whether to use experimental fling curve or existing fling curve, which
lives in ui.

This CL moves the experimental fling animation flag from content to ui.

Bug: 647137
Change-Id: Ia8051ec250ed6c8c8170d41eb3e52b2e32e9ffab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884515
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Daniel Libby <dlibby@microsoft.com>
Commit-Queue: Sarthak Shah <sarsha@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#713230}
  • Loading branch information
mssarthakshah authored and Commit Bot committed Nov 6, 2019
1 parent f9fe5c4 commit 31dfc58
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
7 changes: 0 additions & 7 deletions content/public/common/content_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -786,13 +786,6 @@ const base::Feature kWebUIPolymer2Exceptions{"WebUIPolymer2Exceptions",
base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(OS_CHROMEOS)

#if defined(OS_WIN)
// Enables the use of a touch fling curve that is based on the behavior of
// native apps on Windows.
const base::Feature kExperimentalFlingAnimation{
"ExperimentalFlingAnimation", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // defined(OS_WIN)

#if defined(OS_MACOSX)
// Enables caching of media devices for the purpose of enumerating them.
const base::Feature kDeviceMonitorMac{"DeviceMonitorMac",
Expand Down
4 changes: 0 additions & 4 deletions content/public/common/content_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,6 @@ CONTENT_EXPORT extern const base::Feature kWebNfc;
CONTENT_EXPORT extern const base::Feature kWebUIPolymer2Exceptions;
#endif

#if defined(OS_WIN)
CONTENT_EXPORT extern const base::Feature kExperimentalFlingAnimation;
#endif // defined(OS_WIN)

#if defined(OS_MACOSX)
CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac;
CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer;
Expand Down
5 changes: 5 additions & 0 deletions ui/base/ui_base_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ const base::Feature kCompositorThreadedScrollbarScrolling = {
"CompositorThreadedScrollbarScrolling", base::FEATURE_DISABLED_BY_DEFAULT};

#if defined(OS_WIN)
// Enables the use of a touch fling curve that is based on the behavior of
// native apps on Windows.
const base::Feature kExperimentalFlingAnimation{
"ExperimentalFlingAnimation", base::FEATURE_DISABLED_BY_DEFAULT};

// Enables InputPane API for controlling on screen keyboard.
const base::Feature kInputPaneOnScreenKeyboard = {
"InputPaneOnScreenKeyboard", base::FEATURE_ENABLED_BY_DEFAULT};
Expand Down
2 changes: 2 additions & 0 deletions ui/base/ui_base_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUiGpuRasterizationEnabled();
COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kCalculateNativeWinOcclusion;
COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kExperimentalFlingAnimation;
COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kInputPaneOnScreenKeyboard;
COMPONENT_EXPORT(UI_BASE_FEATURES)
extern const base::Feature kPointerEventsForTouch;
Expand Down

0 comments on commit 31dfc58

Please sign in to comment.