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

Side by Side Diff: cc/trees/layer_tree_impl.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 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 LayerImpl* CurrentlyScrollingLayer() const; 200 LayerImpl* CurrentlyScrollingLayer() const;
201 int LastScrolledLayerId() const; 201 int LastScrolledLayerId() const;
202 void SetCurrentlyScrollingLayer(LayerImpl* layer); 202 void SetCurrentlyScrollingLayer(LayerImpl* layer);
203 void ClearCurrentlyScrollingLayer(); 203 void ClearCurrentlyScrollingLayer();
204 204
205 void SetViewportLayersFromIds(int overscroll_elasticity_layer, 205 void SetViewportLayersFromIds(int overscroll_elasticity_layer,
206 int page_scale_layer_id, 206 int page_scale_layer_id,
207 int inner_viewport_scroll_layer_id, 207 int inner_viewport_scroll_layer_id,
208 int outer_viewport_scroll_layer_id); 208 int outer_viewport_scroll_layer_id);
209 void ClearViewportLayers(); 209 void ClearViewportLayers();
210
211 void SetRootScrollerLayerFromId(int root_scroller_layer_id);
212 LayerImpl* RootScrollerLayer() { return LayerById(root_scroller_layer_id_); }
213
210 LayerImpl* OverscrollElasticityLayer() { 214 LayerImpl* OverscrollElasticityLayer() {
211 return LayerById(overscroll_elasticity_layer_id_); 215 return LayerById(overscroll_elasticity_layer_id_);
212 } 216 }
213 LayerImpl* PageScaleLayer() { return LayerById(page_scale_layer_id_); } 217 LayerImpl* PageScaleLayer() { return LayerById(page_scale_layer_id_); }
214 void ApplySentScrollAndScaleDeltasFromAbortedCommit(); 218 void ApplySentScrollAndScaleDeltasFromAbortedCommit();
215 219
216 SkColor background_color() const { return background_color_; } 220 SkColor background_color() const { return background_color_; }
217 void set_background_color(SkColor color) { background_color_ = color; } 221 void set_background_color(SkColor color) { background_color_ = color; }
218 222
219 bool has_transparent_background() const { 223 bool has_transparent_background() const {
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 HeadsUpDisplayLayerImpl* hud_layer_; 511 HeadsUpDisplayLayerImpl* hud_layer_;
508 PropertyTrees property_trees_; 512 PropertyTrees property_trees_;
509 SkColor background_color_; 513 SkColor background_color_;
510 bool has_transparent_background_; 514 bool has_transparent_background_;
511 515
512 int last_scrolled_layer_id_; 516 int last_scrolled_layer_id_;
513 int overscroll_elasticity_layer_id_; 517 int overscroll_elasticity_layer_id_;
514 int page_scale_layer_id_; 518 int page_scale_layer_id_;
515 int inner_viewport_scroll_layer_id_; 519 int inner_viewport_scroll_layer_id_;
516 int outer_viewport_scroll_layer_id_; 520 int outer_viewport_scroll_layer_id_;
521 int root_scroller_layer_id_;
517 522
518 LayerSelection selection_; 523 LayerSelection selection_;
519 524
520 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_; 525 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
521 float min_page_scale_factor_; 526 float min_page_scale_factor_;
522 float max_page_scale_factor_; 527 float max_page_scale_factor_;
523 528
524 float device_scale_factor_; 529 float device_scale_factor_;
525 float painted_device_scale_factor_; 530 float painted_device_scale_factor_;
526 531
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 593
589 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 594 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
590 595
591 private: 596 private:
592 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 597 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
593 }; 598 };
594 599
595 } // namespace cc 600 } // namespace cc
596 601
597 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 602 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698