Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 2918753002: Prevent create ScrollbarAnimationController for Mac Overlay Scrollbar (Closed)
Patch Set: fix without MACOSX macro Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 8f1158a43028672145c9780774844f607ab8df27..dec06bab11eb8c2b290381b40713164b261dbc32 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -1707,7 +1707,9 @@ void LayerTreeImpl::RegisterScrollbar(ScrollbarLayerImplBase* scrollbar_layer) {
scrollbar_ids.vertical = scrollbar_layer->id();
}
- if (IsActiveTree() && scrollbar_layer->is_overlay_scrollbar()) {
+ if (IsActiveTree() && scrollbar_layer->is_overlay_scrollbar() &&
+ scrollbar_layer->GetScrollbarAnimator() !=
+ LayerTreeSettings::NO_ANIMATOR) {
layer_tree_host_impl_->RegisterScrollbarAnimationController(
scroll_element_id, scrollbar_layer->Opacity());
}
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698