summaryrefslogtreecommitdiffstats
path: root/cc/cc.gyp
diff options
context:
space:
mode:
authorvmpstr <vmpstr@chromium.org>2016-03-02 16:38:40 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-03 00:40:15 +0000
commit64cdba3378dc100a9df0e5106cecad505db3634d (patch)
tree1c35901e7d22e3e691cec341f37e13219b2866a4 /cc/cc.gyp
parenta9a251104615db1e032a4173f6e9c6a53c317bce (diff)
downloadchromium_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/cc.gyp')
-rw-r--r--cc/cc.gyp11
1 files changed, 7 insertions, 4 deletions
diff --git a/cc/cc.gyp b/cc/cc.gyp
index bffecd1..d64e7ae 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -506,7 +506,8 @@
'scheduler/video_frame_controller.h',
'tiles/eviction_tile_priority_queue.cc',
'tiles/eviction_tile_priority_queue.h',
- 'tiles/image_decode_controller.cc',
+ 'tiles/gpu_image_decode_controller.cc',
+ 'tiles/gpu_image_decode_controller.h',
'tiles/image_decode_controller.h',
'tiles/picture_layer_tiling.cc',
'tiles/picture_layer_tiling.h',
@@ -514,16 +515,18 @@
'tiles/picture_layer_tiling_set.h',
'tiles/prioritized_tile.cc',
'tiles/prioritized_tile.h',
- 'tiles/raster_tile_priority_queue.cc',
- 'tiles/raster_tile_priority_queue.h',
'tiles/raster_tile_priority_queue_all.cc',
'tiles/raster_tile_priority_queue_all.h',
+ 'tiles/raster_tile_priority_queue.cc',
+ 'tiles/raster_tile_priority_queue.h',
'tiles/raster_tile_priority_queue_required.cc',
'tiles/raster_tile_priority_queue_required.h',
+ 'tiles/software_image_decode_controller.cc',
+ 'tiles/software_image_decode_controller.h',
'tiles/tile.cc',
- 'tiles/tile.h',
'tiles/tile_draw_info.cc',
'tiles/tile_draw_info.h',
+ 'tiles/tile.h',
'tiles/tile_manager.cc',
'tiles/tile_manager.h',
'tiles/tile_priority.cc',