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

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

Issue 1766053002: Clean LayerImpl's scroll offset callers in unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove transform tree update setting Created 4 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_impl.cc ('k') | cc/trees/property_tree.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PROPERTY_TREE_H_ 5 #ifndef CC_TREES_PROPERTY_TREE_H_
6 #define CC_TREES_PROPERTY_TREE_H_ 6 #define CC_TREES_PROPERTY_TREE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <unordered_map> 10 #include <unordered_map>
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 typedef std::unordered_map<int, scoped_refptr<SyncedScrollOffset>> 569 typedef std::unordered_map<int, scoped_refptr<SyncedScrollOffset>>
570 ScrollOffsetMap; 570 ScrollOffsetMap;
571 571
572 gfx::ScrollOffset MaxScrollOffset(int scroll_node_id) const; 572 gfx::ScrollOffset MaxScrollOffset(int scroll_node_id) const;
573 gfx::Size scroll_clip_layer_bounds(int scroll_node_id) const; 573 gfx::Size scroll_clip_layer_bounds(int scroll_node_id) const;
574 ScrollNode* CurrentlyScrollingNode(); 574 ScrollNode* CurrentlyScrollingNode();
575 const ScrollNode* CurrentlyScrollingNode() const; 575 const ScrollNode* CurrentlyScrollingNode() const;
576 void set_currently_scrolling_node(int scroll_node_id); 576 void set_currently_scrolling_node(int scroll_node_id);
577 gfx::Transform ScreenSpaceTransform(int scroll_node_id) const; 577 gfx::Transform ScreenSpaceTransform(int scroll_node_id) const;
578 578
579 // synced_scroll_offset is supposed to be called by Layer/LayerImpl only
580 SyncedScrollOffset* synced_scroll_offset(int layer_id); 579 SyncedScrollOffset* synced_scroll_offset(int layer_id);
580 const SyncedScrollOffset* synced_scroll_offset(int layer_id) const;
581 void CollectScrollDeltas(ScrollAndScaleSet* scroll_info); 581 void CollectScrollDeltas(ScrollAndScaleSet* scroll_info);
582 void UpdateScrollOffsetMap(ScrollOffsetMap* new_scroll_offset_map, 582 void UpdateScrollOffsetMap(ScrollOffsetMap* new_scroll_offset_map,
583 LayerTreeImpl* layer_tree_impl); 583 LayerTreeImpl* layer_tree_impl);
584 ScrollOffsetMap& scroll_offset_map(); 584 ScrollOffsetMap& scroll_offset_map();
585 const ScrollOffsetMap& scroll_offset_map() const; 585 const ScrollOffsetMap& scroll_offset_map() const;
586 void ApplySentScrollDeltasFromAbortedCommit(); 586 void ApplySentScrollDeltasFromAbortedCommit();
587 bool SetScrollOffset(int layer_id, const gfx::ScrollOffset& scroll_offset); 587 bool SetScrollOffset(int layer_id, const gfx::ScrollOffset& scroll_offset);
588 bool UpdateScrollOffsetBaseForTesting(int layer_id,
589 const gfx::ScrollOffset& offset);
590 const gfx::ScrollOffset GetScrollOffsetBaseForTesting(int layer_id) const;
588 591
589 private: 592 private:
590 int currently_scrolling_node_id_; 593 int currently_scrolling_node_id_;
591 ScrollOffsetMap layer_id_to_scroll_offset_map_; 594 ScrollOffsetMap layer_id_to_scroll_offset_map_;
592 595
593 gfx::ScrollOffset PullDeltaForMainThread(SyncedScrollOffset* scroll_offset); 596 gfx::ScrollOffset PullDeltaForMainThread(SyncedScrollOffset* scroll_offset);
594 void UpdateScrollOffsetMapEntry(int key, 597 void UpdateScrollOffsetMapEntry(int key,
595 ScrollOffsetMap* new_scroll_offset_map, 598 ScrollOffsetMap* new_scroll_offset_map,
596 LayerTreeImpl* layer_tree_impl); 599 LayerTreeImpl* layer_tree_impl);
597 }; 600 };
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 652
650 private: 653 private:
651 gfx::Vector2dF inner_viewport_container_bounds_delta_; 654 gfx::Vector2dF inner_viewport_container_bounds_delta_;
652 gfx::Vector2dF outer_viewport_container_bounds_delta_; 655 gfx::Vector2dF outer_viewport_container_bounds_delta_;
653 gfx::Vector2dF inner_viewport_scroll_bounds_delta_; 656 gfx::Vector2dF inner_viewport_scroll_bounds_delta_;
654 }; 657 };
655 658
656 } // namespace cc 659 } // namespace cc
657 660
658 #endif // CC_TREES_PROPERTY_TREE_H_ 661 #endif // CC_TREES_PROPERTY_TREE_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698