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

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

Powered by Google App Engine
This is Rietveld 408576698