diff options
author | vmpstr <vmpstr@chromium.org> | 2016-03-02 16:38:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 00:40:15 +0000 |
commit | 64cdba3378dc100a9df0e5106cecad505db3634d (patch) | |
tree | 1c35901e7d22e3e691cec341f37e13219b2866a4 /cc/trees/layer_tree_host_impl.h | |
parent | a9a251104615db1e032a4173f6e9c6a53c317bce (diff) | |
download | chromium_src-64cdba3378dc100a9df0e5106cecad505db3634d.zip chromium_src-64cdba3378dc100a9df0e5106cecad505db3634d.tar.gz chromium_src-64cdba3378dc100a9df0e5106cecad505db3634d.tar.bz2 |
cc: Separate ImageDecodeController into software and gpu parts.
This patch separates ImageDecodeController into the software and gpu
components, which are created when tile manager resources are set.
This allows independent development of the two paths without extra
complications involved trying to handle both cases in the same class.
R=enne, ericrk
BUG=581423
CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1642803003
Cr-Commit-Position: refs/heads/master@{#378895}
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
-rw-r--r-- | cc/trees/layer_tree_host_impl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 9c2e58e..6d1212f 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -36,6 +36,7 @@ #include "cc/scheduler/commit_earlyout_reason.h" #include "cc/scheduler/draw_result.h" #include "cc/scheduler/video_frame_controller.h" +#include "cc/tiles/image_decode_controller.h" #include "cc/tiles/tile_manager.h" #include "cc/trees/layer_tree_settings.h" #include "cc/trees/mutator_host_client.h" @@ -402,6 +403,9 @@ class CC_EXPORT LayerTreeHostImpl } ResourcePool* resource_pool() { return resource_pool_.get(); } Renderer* renderer() { return renderer_.get(); } + ImageDecodeController* image_decode_controller() { + return image_decode_controller_.get(); + } const RendererCapabilitiesImpl& GetRendererCapabilities() const; virtual bool SwapBuffers(const FrameData& frame); @@ -731,6 +735,7 @@ class CC_EXPORT LayerTreeHostImpl scoped_ptr<TileTaskWorkerPool> tile_task_worker_pool_; scoped_ptr<ResourcePool> resource_pool_; scoped_ptr<Renderer> renderer_; + scoped_ptr<ImageDecodeController> image_decode_controller_; GlobalStateThatImpactsTilePriority global_tile_state_; |