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

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

Issue 23530003: cc: Block commit on activate by setting a flag on LayerTreeHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: blockcommit: fix flake 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 | « cc/test/fake_proxy.h ('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 <vector> 10 #include <vector>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 const RendererCapabilities& GetRendererCapabilities() const; 184 const RendererCapabilities& GetRendererCapabilities() const;
185 185
186 void SetNeedsAnimate(); 186 void SetNeedsAnimate();
187 virtual void SetNeedsUpdateLayers(); 187 virtual void SetNeedsUpdateLayers();
188 virtual void SetNeedsCommit(); 188 virtual void SetNeedsCommit();
189 virtual void SetNeedsFullTreeSync(); 189 virtual void SetNeedsFullTreeSync();
190 void SetNeedsRedraw(); 190 void SetNeedsRedraw();
191 void SetNeedsRedrawRect(gfx::Rect damage_rect); 191 void SetNeedsRedrawRect(gfx::Rect damage_rect);
192 bool CommitRequested() const; 192 bool CommitRequested() const;
193 193
194 void SetNextCommitWaitsForActivation();
195
194 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, 196 void SetAnimationEvents(scoped_ptr<AnimationEventsVector> events,
195 base::Time wall_clock_time); 197 base::Time wall_clock_time);
196 198
197 void SetRootLayer(scoped_refptr<Layer> root_layer); 199 void SetRootLayer(scoped_refptr<Layer> root_layer);
198 Layer* root_layer() { return root_layer_.get(); } 200 Layer* root_layer() { return root_layer_.get(); }
199 const Layer* root_layer() const { return root_layer_.get(); } 201 const Layer* root_layer() const { return root_layer_.get(); }
200 202
201 const LayerTreeSettings& settings() const { return settings_; } 203 const LayerTreeSettings& settings() const { return settings_; }
202 204
203 void SetDebugState(const LayerTreeDebugState& debug_state); 205 void SetDebugState(const LayerTreeDebugState& debug_state);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 bool animate); 261 bool animate);
260 262
261 HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); } 263 HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); }
262 264
263 Proxy* proxy() const { return proxy_.get(); } 265 Proxy* proxy() const { return proxy_.get(); }
264 266
265 AnimationRegistrar* animation_registrar() const { 267 AnimationRegistrar* animation_registrar() const {
266 return animation_registrar_.get(); 268 return animation_registrar_.get();
267 } 269 }
268 270
269 bool BlocksPendingCommit() const;
270
271 // Obtains a thorough dump of the LayerTreeHost as a value. 271 // Obtains a thorough dump of the LayerTreeHost as a value.
272 scoped_ptr<base::Value> AsValue() const; 272 scoped_ptr<base::Value> AsValue() const;
273 273
274 bool in_paint_layer_contents() const { return in_paint_layer_contents_; } 274 bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
275 275
276 // CreateUIResource creates a resource given a bitmap. The bitmap is 276 // CreateUIResource creates a resource given a bitmap. The bitmap is
277 // generated via an interface function, which is called when initializing the 277 // generated via an interface function, which is called when initializing the
278 // resource and when the resource has been lost (due to lost context). The 278 // resource and when the resource has been lost (due to lost context). The
279 // parameter of the interface is a single boolean, which indicates whether the 279 // parameter of the interface is a single boolean, which indicates whether the
280 // resource has been lost or not. CreateUIResource returns an Id of the 280 // resource has been lost or not. CreateUIResource returns an Id of the
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 }; 411 };
412 LCDTextMetrics lcd_text_metrics_; 412 LCDTextMetrics lcd_text_metrics_;
413 int tree_id_; 413 int tree_id_;
414 414
415 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 415 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
416 }; 416 };
417 417
418 } // namespace cc 418 } // namespace cc
419 419
420 #endif // CC_TREES_LAYER_TREE_HOST_H_ 420 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/test/fake_proxy.h ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698