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

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

Issue 1232573005: cc: Make sure we don't insert or remove layers during painting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr; 80 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr;
81 TaskGraphRunner* task_graph_runner = nullptr; 81 TaskGraphRunner* task_graph_runner = nullptr;
82 LayerTreeSettings const* settings = nullptr; 82 LayerTreeSettings const* settings = nullptr;
83 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner; 83 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner;
84 scoped_ptr<BeginFrameSource> external_begin_frame_source; 84 scoped_ptr<BeginFrameSource> external_begin_frame_source;
85 85
86 InitParams(); 86 InitParams();
87 ~InitParams(); 87 ~InitParams();
88 }; 88 };
89 89
90 bool in_update() const { return in_update_; }
91
90 // The SharedBitmapManager will be used on the compositor thread. 92 // The SharedBitmapManager will be used on the compositor thread.
91 static scoped_ptr<LayerTreeHost> CreateThreaded( 93 static scoped_ptr<LayerTreeHost> CreateThreaded(
92 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, 94 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
93 InitParams* params); 95 InitParams* params);
94 96
95 static scoped_ptr<LayerTreeHost> CreateSingleThreaded( 97 static scoped_ptr<LayerTreeHost> CreateSingleThreaded(
96 LayerTreeHostSingleThreadClient* single_thread_client, 98 LayerTreeHostSingleThreadClient* single_thread_client,
97 InitParams* params); 99 InitParams* params);
98 virtual ~LayerTreeHost(); 100 virtual ~LayerTreeHost();
99 101
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 scoped_refptr<Layer> page_scale_layer_; 473 scoped_refptr<Layer> page_scale_layer_;
472 scoped_refptr<Layer> inner_viewport_scroll_layer_; 474 scoped_refptr<Layer> inner_viewport_scroll_layer_;
473 scoped_refptr<Layer> outer_viewport_scroll_layer_; 475 scoped_refptr<Layer> outer_viewport_scroll_layer_;
474 476
475 LayerSelection selection_; 477 LayerSelection selection_;
476 478
477 SharedBitmapManager* shared_bitmap_manager_; 479 SharedBitmapManager* shared_bitmap_manager_;
478 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_; 480 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
479 TaskGraphRunner* task_graph_runner_; 481 TaskGraphRunner* task_graph_runner_;
480 482
483 bool in_update_;
484
481 ScopedPtrVector<SwapPromise> swap_promise_list_; 485 ScopedPtrVector<SwapPromise> swap_promise_list_;
482 std::set<SwapPromiseMonitor*> swap_promise_monitor_; 486 std::set<SwapPromiseMonitor*> swap_promise_monitor_;
483 487
484 PropertyTrees property_trees_; 488 PropertyTrees property_trees_;
485 489
486 typedef base::hash_map<int, Layer*> LayerIdMap; 490 typedef base::hash_map<int, Layer*> LayerIdMap;
487 LayerIdMap layer_id_map_; 491 LayerIdMap layer_id_map_;
488 492
489 uint32_t surface_id_namespace_; 493 uint32_t surface_id_namespace_;
490 uint32_t next_surface_sequence_; 494 uint32_t next_surface_sequence_;
491 495
492 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 496 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
493 }; 497 };
494 498
495 } // namespace cc 499 } // namespace cc
496 500
497 #endif // CC_TREES_LAYER_TREE_HOST_H_ 501 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« cc/layers/layer.cc ('K') | « cc/layers/layer.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698