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

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

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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
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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 LocalSurfaceId local_surface_id_; 510 LocalSurfaceId local_surface_id_;
511 511
512 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_; 512 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
513 513
514 std::unique_ptr<OwnedLayerImplList> layers_; 514 std::unique_ptr<OwnedLayerImplList> layers_;
515 LayerImplMap layer_id_map_; 515 LayerImplMap layer_id_map_;
516 LayerImplList layer_list_; 516 LayerImplList layer_list_;
517 // Set of layers that need to push properties. 517 // Set of layers that need to push properties.
518 std::unordered_set<LayerImpl*> layers_that_should_push_properties_; 518 std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
519 519
520 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_; 520 std::unordered_map<ElementId, int> element_layers_map_;
521 521
522 std::unordered_map<ElementId, float, ElementIdHash> 522 std::unordered_map<ElementId, float> element_id_to_opacity_animations_;
523 element_id_to_opacity_animations_; 523 std::unordered_map<ElementId, gfx::Transform>
524 std::unordered_map<ElementId, gfx::Transform, ElementIdHash>
525 element_id_to_transform_animations_; 524 element_id_to_transform_animations_;
526 std::unordered_map<ElementId, FilterOperations, ElementIdHash> 525 std::unordered_map<ElementId, FilterOperations>
527 element_id_to_filter_animations_; 526 element_id_to_filter_animations_;
528 527
529 // Maps from clip layer ids to scroll layer ids. Note that this only includes 528 // Maps from clip layer ids to scroll layer ids. Note that this only includes
530 // the subset of clip layers that act as scrolling containers. (This is 529 // the subset of clip layers that act as scrolling containers. (This is
531 // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.) 530 // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
532 std::unordered_map<int, int> clip_scroll_map_; 531 std::unordered_map<int, int> clip_scroll_map_;
533 532
534 // Maps scroll element ids to scrollbar layer ids. For each scroll layer, 533 // Maps scroll element ids to scrollbar layer ids. For each scroll layer,
535 // there may be 1 or 2 scrollbar layers (for vertical and horizontal). (This 534 // there may be 1 or 2 scrollbar layers (for vertical and horizontal). (This
536 // is derived from ScrollbarLayerImplBase::scroll_element_id_ and exists to 535 // is derived from ScrollbarLayerImplBase::scroll_element_id_ and exists to
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 581
583 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 582 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
584 583
585 private: 584 private:
586 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 585 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
587 }; 586 };
588 587
589 } // namespace cc 588 } // namespace cc
590 589
591 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 590 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698