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

Unified Diff: cc/trees/layer_tree_host_in_process.h

Issue 2452483002: Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink (Closed)
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_host_in_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_in_process.h
diff --git a/cc/trees/layer_tree_host_in_process.h b/cc/trees/layer_tree_host_in_process.h
index 5eed0099e70a0ea856e241cc67c5390b0c27eb8c..9e95974e99194035aa877691cecf16d066e7fa2c 100644
--- a/cc/trees/layer_tree_host_in_process.h
+++ b/cc/trees/layer_tree_host_in_process.h
@@ -45,10 +45,6 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/rect.h"
-namespace gpu {
-class GpuMemoryBufferManager;
-} // namespace gpu
-
namespace cc {
class AnimationHost;
class AnimationEvents;
@@ -69,7 +65,6 @@ class RemoteProtoChannel;
class RenderingStatsInstrumentation;
class ResourceProvider;
class ResourceUpdateQueue;
-class SharedBitmapManager;
class TaskGraphRunner;
struct PendingPageScaleAnimation;
struct RenderingStats;
@@ -85,8 +80,6 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
// std::move()d to the Create* functions.
struct CC_EXPORT InitParams {
LayerTreeHostClient* client = nullptr;
- SharedBitmapManager* shared_bitmap_manager = nullptr;
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr;
TaskGraphRunner* task_graph_runner = nullptr;
LayerTreeSettings const* settings = nullptr;
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner;
@@ -97,7 +90,6 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
~InitParams();
};
- // The SharedBitmapManager will be used on the compositor thread.
static std::unique_ptr<LayerTreeHostInProcess> CreateThreaded(
scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
InitParams* params);
@@ -275,15 +267,8 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
void SetUIResourceManagerForTesting(
std::unique_ptr<UIResourceManager> ui_resource_manager);
- // shared_bitmap_manager(), gpu_memory_buffer_manager(), and
- // task_graph_runner() return valid values only until the LayerTreeHostImpl is
- // created in CreateLayerTreeHostImpl().
- SharedBitmapManager* shared_bitmap_manager() const {
- return shared_bitmap_manager_;
- }
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() const {
- return gpu_memory_buffer_manager_;
- }
+ // task_graph_runner() returns a valid value only until the LayerTreeHostImpl
+ // is created in CreateLayerTreeHostImpl().
TaskGraphRunner* task_graph_runner() const { return task_graph_runner_; }
void OnCommitForSwapPromises();
@@ -355,8 +340,6 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
bool next_commit_forces_redraw_ = false;
bool next_commit_forces_recalculate_raster_scales_ = false;
- SharedBitmapManager* shared_bitmap_manager_;
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
TaskGraphRunner* task_graph_runner_;
ImageSerializationProcessor* image_serialization_processor_;
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_host_in_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698