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

Side by Side Diff: cc/trees/layer_tree_impl.h

Issue 2758343002: cc: Use Element Id to Record Animation Changes (Closed)
Patch Set: fix for test Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_; 509 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
510 510
511 std::unique_ptr<OwnedLayerImplList> layers_; 511 std::unique_ptr<OwnedLayerImplList> layers_;
512 LayerImplMap layer_id_map_; 512 LayerImplMap layer_id_map_;
513 LayerImplList layer_list_; 513 LayerImplList layer_list_;
514 // Set of layers that need to push properties. 514 // Set of layers that need to push properties.
515 std::unordered_set<LayerImpl*> layers_that_should_push_properties_; 515 std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
516 516
517 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_; 517 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_;
518 518
519 std::unordered_map<int, float> opacity_animations_map_; 519 std::unordered_map<ElementId, float, ElementIdHash>
520 std::unordered_map<int, gfx::Transform> transform_animations_map_; 520 element_id_to_opacity_animations_;
521 std::unordered_map<int, FilterOperations> filter_animations_map_; 521 std::unordered_map<ElementId, gfx::Transform, ElementIdHash>
522 element_id_to_transform_animations_;
523 std::unordered_map<ElementId, FilterOperations, ElementIdHash>
524 element_id_to_filter_animations_;
522 525
523 // Maps from clip layer ids to scroll layer ids. Note that this only includes 526 // Maps from clip layer ids to scroll layer ids. Note that this only includes
524 // the subset of clip layers that act as scrolling containers. (This is 527 // the subset of clip layers that act as scrolling containers. (This is
525 // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.) 528 // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
526 std::unordered_map<int, int> clip_scroll_map_; 529 std::unordered_map<int, int> clip_scroll_map_;
527 530
528 // Maps scroll layer ids to scrollbar layer ids. For each scroll layer, there 531 // Maps scroll layer ids to scrollbar layer ids. For each scroll layer, there
529 // may be 1 or 2 scrollbar layers (for vertical and horizontal). (This is 532 // may be 1 or 2 scrollbar layers (for vertical and horizontal). (This is
530 // derived from ScrollbarLayerImplBase::scroll_layer_id_ and exists to avoid 533 // derived from ScrollbarLayerImplBase::scroll_layer_id_ and exists to avoid
531 // O(n) walks.) 534 // O(n) walks.)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 577
575 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 578 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
576 579
577 private: 580 private:
578 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 581 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
579 }; 582 };
580 583
581 } // namespace cc 584 } // namespace cc
582 585
583 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 586 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698