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

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

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « cc/test/fake_content_layer_client.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 <set> 10 #include <set>
(...skipping 16 matching lines...) Expand all
27 #include "cc/debug/micro_benchmark.h" 27 #include "cc/debug/micro_benchmark.h"
28 #include "cc/debug/micro_benchmark_controller.h" 28 #include "cc/debug/micro_benchmark_controller.h"
29 #include "cc/input/input_handler.h" 29 #include "cc/input/input_handler.h"
30 #include "cc/input/layer_selection_bound.h" 30 #include "cc/input/layer_selection_bound.h"
31 #include "cc/input/scrollbar.h" 31 #include "cc/input/scrollbar.h"
32 #include "cc/input/top_controls_state.h" 32 #include "cc/input/top_controls_state.h"
33 #include "cc/layers/layer_lists.h" 33 #include "cc/layers/layer_lists.h"
34 #include "cc/output/output_surface.h" 34 #include "cc/output/output_surface.h"
35 #include "cc/resources/resource_format.h" 35 #include "cc/resources/resource_format.h"
36 #include "cc/resources/scoped_ui_resource.h" 36 #include "cc/resources/scoped_ui_resource.h"
37 #include "cc/surfaces/surface_sequence.h"
37 #include "cc/trees/layer_tree_host_client.h" 38 #include "cc/trees/layer_tree_host_client.h"
38 #include "cc/trees/layer_tree_host_common.h" 39 #include "cc/trees/layer_tree_host_common.h"
39 #include "cc/trees/layer_tree_settings.h" 40 #include "cc/trees/layer_tree_settings.h"
40 #include "cc/trees/proxy.h" 41 #include "cc/trees/proxy.h"
41 #include "third_party/skia/include/core/SkColor.h" 42 #include "third_party/skia/include/core/SkColor.h"
42 #include "ui/gfx/geometry/rect.h" 43 #include "ui/gfx/geometry/rect.h"
43 44
44 namespace gpu { 45 namespace gpu {
45 class GpuMemoryBufferManager; 46 class GpuMemoryBufferManager;
46 } 47 }
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 void RemoveSwapPromiseMonitor(SwapPromiseMonitor* monitor); 301 void RemoveSwapPromiseMonitor(SwapPromiseMonitor* monitor);
301 302
302 // Call this function when you expect there to be a swap buffer. 303 // Call this function when you expect there to be a swap buffer.
303 // See swap_promise.h for how to use SwapPromise. 304 // See swap_promise.h for how to use SwapPromise.
304 void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise); 305 void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise);
305 306
306 void BreakSwapPromises(SwapPromise::DidNotSwapReason reason); 307 void BreakSwapPromises(SwapPromise::DidNotSwapReason reason);
307 308
308 size_t num_queued_swap_promises() const { return swap_promise_list_.size(); } 309 size_t num_queued_swap_promises() const { return swap_promise_list_.size(); }
309 310
311 void set_surface_id_namespace(uint32_t id_namespace);
312 SurfaceSequence CreateSurfaceSequence();
313
310 protected: 314 protected:
311 LayerTreeHost(LayerTreeHostClient* client, 315 LayerTreeHost(LayerTreeHostClient* client,
312 SharedBitmapManager* shared_bitmap_manager, 316 SharedBitmapManager* shared_bitmap_manager,
313 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 317 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
314 const LayerTreeSettings& settings); 318 const LayerTreeSettings& settings);
315 void InitializeThreaded( 319 void InitializeThreaded(
316 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 320 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
317 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); 321 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
318 void InitializeSingleThreaded( 322 void InitializeSingleThreaded(
319 LayerTreeHostSingleThreadClient* single_thread_client, 323 LayerTreeHostSingleThreadClient* single_thread_client,
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 461
458 LayerSelectionBound selection_start_; 462 LayerSelectionBound selection_start_;
459 LayerSelectionBound selection_end_; 463 LayerSelectionBound selection_end_;
460 464
461 SharedBitmapManager* shared_bitmap_manager_; 465 SharedBitmapManager* shared_bitmap_manager_;
462 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_; 466 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
463 467
464 ScopedPtrVector<SwapPromise> swap_promise_list_; 468 ScopedPtrVector<SwapPromise> swap_promise_list_;
465 std::set<SwapPromiseMonitor*> swap_promise_monitor_; 469 std::set<SwapPromiseMonitor*> swap_promise_monitor_;
466 470
471 uint32_t surface_id_namespace_;
472 uint32_t next_surface_sequence_;
473
467 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 474 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
468 }; 475 };
469 476
470 } // namespace cc 477 } // namespace cc
471 478
472 #endif // CC_TREES_LAYER_TREE_HOST_H_ 479 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/test/fake_content_layer_client.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698