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

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

Issue 23694031: Fix race conditions in window snapshot code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added screenshot sync test to telemetry unittests, updated cc unittest Created 7 years, 2 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
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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 void SetNeedsAnimate(); 205 void SetNeedsAnimate();
206 virtual void SetNeedsUpdateLayers(); 206 virtual void SetNeedsUpdateLayers();
207 virtual void SetNeedsCommit(); 207 virtual void SetNeedsCommit();
208 virtual void SetNeedsFullTreeSync(); 208 virtual void SetNeedsFullTreeSync();
209 void SetNeedsRedraw(); 209 void SetNeedsRedraw();
210 void SetNeedsRedrawRect(gfx::Rect damage_rect); 210 void SetNeedsRedrawRect(gfx::Rect damage_rect);
211 bool CommitRequested() const; 211 bool CommitRequested() const;
212 212
213 void SetNextCommitWaitsForActivation(); 213 void SetNextCommitWaitsForActivation();
214 214
215 void SetNextCommitForcesRedraw();
216
215 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, 217 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events,
216 base::Time wall_clock_time); 218 base::Time wall_clock_time);
217 219
218 void SetRootLayer(scoped_refptr<Layer> root_layer); 220 void SetRootLayer(scoped_refptr<Layer> root_layer);
219 Layer* root_layer() { return root_layer_.get(); } 221 Layer* root_layer() { return root_layer_.get(); }
220 const Layer* root_layer() const { return root_layer_.get(); } 222 const Layer* root_layer() const { return root_layer_.get(); }
221 void RegisterViewportLayers( 223 void RegisterViewportLayers(
222 scoped_refptr<Layer> page_scale_layer, 224 scoped_refptr<Layer> page_scale_layer,
223 scoped_refptr<Layer> inner_viewport_scroll_layer, 225 scoped_refptr<Layer> inner_viewport_scroll_layer,
224 scoped_refptr<Layer> outer_viewport_scroll_layer); 226 scoped_refptr<Layer> outer_viewport_scroll_layer);
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 : total_num_cc_layers(0), 442 : total_num_cc_layers(0),
441 total_num_cc_layers_can_use_lcd_text(0), 443 total_num_cc_layers_can_use_lcd_text(0),
442 total_num_cc_layers_will_use_lcd_text(0) {} 444 total_num_cc_layers_will_use_lcd_text(0) {}
443 445
444 int64 total_num_cc_layers; 446 int64 total_num_cc_layers;
445 int64 total_num_cc_layers_can_use_lcd_text; 447 int64 total_num_cc_layers_can_use_lcd_text;
446 int64 total_num_cc_layers_will_use_lcd_text; 448 int64 total_num_cc_layers_will_use_lcd_text;
447 }; 449 };
448 LCDTextMetrics lcd_text_metrics_; 450 LCDTextMetrics lcd_text_metrics_;
449 int tree_id_; 451 int tree_id_;
452 bool next_commit_forces_redraw_;
450 453
451 scoped_refptr<Layer> page_scale_layer_; 454 scoped_refptr<Layer> page_scale_layer_;
452 scoped_refptr<Layer> inner_viewport_scroll_layer_; 455 scoped_refptr<Layer> inner_viewport_scroll_layer_;
453 scoped_refptr<Layer> outer_viewport_scroll_layer_; 456 scoped_refptr<Layer> outer_viewport_scroll_layer_;
454 457
455 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 458 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
456 }; 459 };
457 460
458 } // namespace cc 461 } // namespace cc
459 462
460 #endif // CC_TREES_LAYER_TREE_HOST_H_ 463 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698