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

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: Addressed Nit 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
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | 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 <string> 10 #include <string>
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 void SetNeedsAnimate(); 208 void SetNeedsAnimate();
209 virtual void SetNeedsUpdateLayers(); 209 virtual void SetNeedsUpdateLayers();
210 virtual void SetNeedsCommit(); 210 virtual void SetNeedsCommit();
211 virtual void SetNeedsFullTreeSync(); 211 virtual void SetNeedsFullTreeSync();
212 void SetNeedsRedraw(); 212 void SetNeedsRedraw();
213 void SetNeedsRedrawRect(gfx::Rect damage_rect); 213 void SetNeedsRedrawRect(gfx::Rect damage_rect);
214 bool CommitRequested() const; 214 bool CommitRequested() const;
215 215
216 void SetNextCommitWaitsForActivation(); 216 void SetNextCommitWaitsForActivation();
217 217
218 void SetNextCommitForcesRedraw();
219
218 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, 220 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events,
219 base::Time wall_clock_time); 221 base::Time wall_clock_time);
220 222
221 void SetRootLayer(scoped_refptr<Layer> root_layer); 223 void SetRootLayer(scoped_refptr<Layer> root_layer);
222 Layer* root_layer() { return root_layer_.get(); } 224 Layer* root_layer() { return root_layer_.get(); }
223 const Layer* root_layer() const { return root_layer_.get(); } 225 const Layer* root_layer() const { return root_layer_.get(); }
224 void RegisterViewportLayers( 226 void RegisterViewportLayers(
225 scoped_refptr<Layer> page_scale_layer, 227 scoped_refptr<Layer> page_scale_layer,
226 scoped_refptr<Layer> inner_viewport_scroll_layer, 228 scoped_refptr<Layer> inner_viewport_scroll_layer,
227 scoped_refptr<Layer> outer_viewport_scroll_layer); 229 scoped_refptr<Layer> outer_viewport_scroll_layer);
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 : total_num_cc_layers(0), 451 : total_num_cc_layers(0),
450 total_num_cc_layers_can_use_lcd_text(0), 452 total_num_cc_layers_can_use_lcd_text(0),
451 total_num_cc_layers_will_use_lcd_text(0) {} 453 total_num_cc_layers_will_use_lcd_text(0) {}
452 454
453 int64 total_num_cc_layers; 455 int64 total_num_cc_layers;
454 int64 total_num_cc_layers_can_use_lcd_text; 456 int64 total_num_cc_layers_can_use_lcd_text;
455 int64 total_num_cc_layers_will_use_lcd_text; 457 int64 total_num_cc_layers_will_use_lcd_text;
456 }; 458 };
457 LCDTextMetrics lcd_text_metrics_; 459 LCDTextMetrics lcd_text_metrics_;
458 int tree_id_; 460 int tree_id_;
461 bool next_commit_forces_redraw_;
459 462
460 scoped_refptr<Layer> page_scale_layer_; 463 scoped_refptr<Layer> page_scale_layer_;
461 scoped_refptr<Layer> inner_viewport_scroll_layer_; 464 scoped_refptr<Layer> inner_viewport_scroll_layer_;
462 scoped_refptr<Layer> outer_viewport_scroll_layer_; 465 scoped_refptr<Layer> outer_viewport_scroll_layer_;
463 466
464 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 467 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
465 }; 468 };
466 469
467 } // namespace cc 470 } // namespace cc
468 471
469 #endif // CC_TREES_LAYER_TREE_HOST_H_ 472 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698