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

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

Issue 2113483002: Make RootScroller set the outer viewport scroll layer in the compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_HOST_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_H_
6 #define CC_TREES_LAYER_TREE_HOST_H_ 6 #define CC_TREES_LAYER_TREE_HOST_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 void SetAnimationEvents(std::unique_ptr<AnimationEvents> events); 207 void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
208 208
209 void SetRootLayer(scoped_refptr<Layer> root_layer); 209 void SetRootLayer(scoped_refptr<Layer> root_layer);
210 Layer* root_layer() { return root_layer_.get(); } 210 Layer* root_layer() { return root_layer_.get(); }
211 const Layer* root_layer() const { return root_layer_.get(); } 211 const Layer* root_layer() const { return root_layer_.get(); }
212 const Layer* overscroll_elasticity_layer() const { 212 const Layer* overscroll_elasticity_layer() const {
213 return overscroll_elasticity_layer_.get(); 213 return overscroll_elasticity_layer_.get();
214 } 214 }
215 const Layer* page_scale_layer() const { return page_scale_layer_.get(); } 215 const Layer* page_scale_layer() const { return page_scale_layer_.get(); }
216 void RegisterViewportLayers(scoped_refptr<Layer> overscroll_elasticity_layer, 216 void RegisterViewportLayers(scoped_refptr<Layer> overscroll_elasticity_layer,
aelias_OOO_until_Jul13 2016/06/29 22:44:08 Can you make it an argument to this (and likewise
bokan 2016/07/07 21:20:45 Done. I moved registerViewportLayers in Blink out
217 scoped_refptr<Layer> page_scale_layer, 217 scoped_refptr<Layer> page_scale_layer,
218 scoped_refptr<Layer> inner_viewport_scroll_layer, 218 scoped_refptr<Layer> inner_viewport_scroll_layer,
aelias_OOO_until_Jul13 2016/06/29 22:44:08 I'm having trouble understanding the intended brea
bokan 2016/07/07 21:20:45 The root scroller is really just designating which
aelias_OOO_until_Jul13 2016/07/07 22:03:15 So, we have another layer right above it called th
bokan 2016/07/07 22:49:53 No, it's basically an indirection. If the page doe
219 scoped_refptr<Layer> outer_viewport_scroll_layer); 219 scoped_refptr<Layer> outer_viewport_scroll_layer);
220
221 // Sets the layer whose scrolling will affect top controls and produce
222 // overscroll effects.
223 void SetRootScrollerLayer(scoped_refptr<Layer> root_scroller_layer);
224
220 Layer* inner_viewport_scroll_layer() const { 225 Layer* inner_viewport_scroll_layer() const {
221 return inner_viewport_scroll_layer_.get(); 226 return inner_viewport_scroll_layer_.get();
222 } 227 }
223 Layer* outer_viewport_scroll_layer() const { 228 Layer* outer_viewport_scroll_layer() const {
224 return outer_viewport_scroll_layer_.get(); 229 return outer_viewport_scroll_layer_.get();
225 } 230 }
226 231
227 void RegisterSelection(const LayerSelection& selection); 232 void RegisterSelection(const LayerSelection& selection);
228 233
229 bool have_scroll_event_handlers() const { 234 bool have_scroll_event_handlers() const {
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 bool in_paint_layer_contents_; 582 bool in_paint_layer_contents_;
578 583
579 int id_; 584 int id_;
580 bool next_commit_forces_redraw_; 585 bool next_commit_forces_redraw_;
581 586
582 scoped_refptr<Layer> overscroll_elasticity_layer_; 587 scoped_refptr<Layer> overscroll_elasticity_layer_;
583 scoped_refptr<Layer> page_scale_layer_; 588 scoped_refptr<Layer> page_scale_layer_;
584 scoped_refptr<Layer> inner_viewport_scroll_layer_; 589 scoped_refptr<Layer> inner_viewport_scroll_layer_;
585 scoped_refptr<Layer> outer_viewport_scroll_layer_; 590 scoped_refptr<Layer> outer_viewport_scroll_layer_;
586 591
592 scoped_refptr<Layer> root_scroller_layer_;
593
587 LayerSelection selection_; 594 LayerSelection selection_;
588 595
589 SharedBitmapManager* shared_bitmap_manager_; 596 SharedBitmapManager* shared_bitmap_manager_;
590 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_; 597 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
591 TaskGraphRunner* task_graph_runner_; 598 TaskGraphRunner* task_graph_runner_;
592 599
593 ImageSerializationProcessor* image_serialization_processor_; 600 ImageSerializationProcessor* image_serialization_processor_;
594 std::unique_ptr<EnginePictureCache> engine_picture_cache_; 601 std::unique_ptr<EnginePictureCache> engine_picture_cache_;
595 std::unique_ptr<ClientPictureCache> client_picture_cache_; 602 std::unique_ptr<ClientPictureCache> client_picture_cache_;
596 603
597 std::vector<std::unique_ptr<SwapPromise>> swap_promise_list_; 604 std::vector<std::unique_ptr<SwapPromise>> swap_promise_list_;
598 std::set<SwapPromiseMonitor*> swap_promise_monitor_; 605 std::set<SwapPromiseMonitor*> swap_promise_monitor_;
599 606
600 PropertyTrees property_trees_; 607 PropertyTrees property_trees_;
601 608
602 using LayerIdMap = std::unordered_map<int, Layer*>; 609 using LayerIdMap = std::unordered_map<int, Layer*>;
603 LayerIdMap layer_id_map_; 610 LayerIdMap layer_id_map_;
604 // Set of layers that need to push properties. 611 // Set of layers that need to push properties.
605 std::unordered_set<Layer*> layers_that_should_push_properties_; 612 std::unordered_set<Layer*> layers_that_should_push_properties_;
606 613
607 uint32_t surface_id_namespace_; 614 uint32_t surface_id_namespace_;
608 uint32_t next_surface_sequence_; 615 uint32_t next_surface_sequence_;
609 616
610 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 617 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
611 }; 618 };
612 619
613 } // namespace cc 620 } // namespace cc
614 621
615 #endif // CC_TREES_LAYER_TREE_HOST_H_ 622 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/cc.gyp ('k') | cc/trees/layer_tree_host.cc » ('j') | cc/trees/root_scroller_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698