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

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

Issue 23483044: Revert "Plumb PinchVirtualViewport layers into CC." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/trees/layer_tree_host.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 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 <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 #include <vector> 10 #include <vector>
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 bool CommitRequested() const; 194 bool CommitRequested() const;
195 195
196 void SetNextCommitWaitsForActivation(); 196 void SetNextCommitWaitsForActivation();
197 197
198 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, 198 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events,
199 base::Time wall_clock_time); 199 base::Time wall_clock_time);
200 200
201 void SetRootLayer(scoped_refptr<Layer> root_layer); 201 void SetRootLayer(scoped_refptr<Layer> root_layer);
202 Layer* root_layer() { return root_layer_.get(); } 202 Layer* root_layer() { return root_layer_.get(); }
203 const Layer* root_layer() const { return root_layer_.get(); } 203 const Layer* root_layer() const { return root_layer_.get(); }
204 void RegisterViewportLayers(
205 scoped_refptr<Layer> page_scale_layer,
206 scoped_refptr<Layer> inner_viewport_scroll_layer,
207 scoped_refptr<Layer> outer_viewport_scroll_layer);
208 204
209 const LayerTreeSettings& settings() const { return settings_; } 205 const LayerTreeSettings& settings() const { return settings_; }
210 206
211 void SetDebugState(const LayerTreeDebugState& debug_state); 207 void SetDebugState(const LayerTreeDebugState& debug_state);
212 const LayerTreeDebugState& debug_state() const { return debug_state_; } 208 const LayerTreeDebugState& debug_state() const { return debug_state_; }
213 209
214 void SetViewportSize(gfx::Size device_viewport_size); 210 void SetViewportSize(gfx::Size device_viewport_size);
215 void SetOverdrawBottomHeight(float overdraw_bottom_height); 211 void SetOverdrawBottomHeight(float overdraw_bottom_height);
216 212
217 gfx::Size device_viewport_size() const { return device_viewport_size_; } 213 gfx::Size device_viewport_size() const { return device_viewport_size_; }
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 total_num_cc_layers_can_use_lcd_text(0), 412 total_num_cc_layers_can_use_lcd_text(0),
417 total_num_cc_layers_will_use_lcd_text(0) {} 413 total_num_cc_layers_will_use_lcd_text(0) {}
418 414
419 int64 total_num_cc_layers; 415 int64 total_num_cc_layers;
420 int64 total_num_cc_layers_can_use_lcd_text; 416 int64 total_num_cc_layers_can_use_lcd_text;
421 int64 total_num_cc_layers_will_use_lcd_text; 417 int64 total_num_cc_layers_will_use_lcd_text;
422 }; 418 };
423 LCDTextMetrics lcd_text_metrics_; 419 LCDTextMetrics lcd_text_metrics_;
424 int tree_id_; 420 int tree_id_;
425 421
426 scoped_refptr<Layer> page_scale_layer_;
427 scoped_refptr<Layer> inner_viewport_scroll_layer_;
428 scoped_refptr<Layer> outer_viewport_scroll_layer_;
429
430 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 422 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
431 }; 423 };
432 424
433 } // namespace cc 425 } // namespace cc
434 426
435 #endif // CC_TREES_LAYER_TREE_HOST_H_ 427 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698