diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:20:05 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:20:05 +0000 |
| commit | 21c9dee7008633174272cf5b61d547916ad31ad8 (patch) | |
| tree | b9da350d287d75353f824392e409a645d1ed470f /cc/trees/layer_tree_settings.h | |
| parent | eb8330d5dd21a23ca1078aba70f1a81d65279e8f (diff) | |
| download | chromium_src-21c9dee7008633174272cf5b61d547916ad31ad8.zip chromium_src-21c9dee7008633174272cf5b61d547916ad31ad8.tar.gz chromium_src-21c9dee7008633174272cf5b61d547916ad31ad8.tar.bz2 | |
Fix scrollbar fade animation scheduling.
In r195531, most of the uses of base::TimeTicks::Now() were replaced by
current frame time, but this is incorrect in the case of scrollbar
fade scheduling. Although the fade itself is animated within draw
frames, the delay until it starts is managed outside frames (intentionally
so -- we want to avoid spamming animation frames before the fade has
actually begun). Revert that part of r195531 and add more test
coverage.
NOTRY=true
BUG=236351
Review URL: https://chromiumcodereview.appspot.com/16925007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_settings.h')
| -rw-r--r-- | cc/trees/layer_tree_settings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index 7f8455f..98d4bb3 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -33,6 +33,8 @@ class CC_EXPORT LayerTreeSettings { bool can_use_lcd_text; bool should_clear_root_render_pass; bool use_linear_fade_scrollbar_animator; + int scrollbar_linear_fade_delay_ms; + int scrollbar_linear_fade_length_ms; bool solid_color_scrollbars; SkColor solid_color_scrollbar_color; int solid_color_scrollbar_thickness_dip; |