Update from https://crrev.com/318214

cc/cc.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 352 matching lines @@
         'resources/bitmap_content_layer_updater.cc',
         'resources/bitmap_content_layer_updater.h',
         'resources/bitmap_skpicture_content_layer_updater.cc',
         'resources/bitmap_skpicture_content_layer_updater.h',
         'resources/bitmap_tile_task_worker_pool.cc',
         'resources/bitmap_tile_task_worker_pool.h',
         'resources/clip_display_item.cc',
         'resources/clip_display_item.h',
         'resources/clip_path_display_item.cc',
         'resources/clip_path_display_item.h',
+        'resources/compositing_display_item.cc',
+        'resources/compositing_display_item.h',
         'resources/content_layer_updater.cc',
         'resources/content_layer_updater.h',
         'resources/display_item.cc',
         'resources/display_item.h',
         'resources/display_item_list.cc',
         'resources/display_item_list.h',
         'resources/display_list_raster_source.cc',
         'resources/display_list_raster_source.h',
         'resources/display_list_recording_source.cc',
         'resources/display_list_recording_source.h',
@@ skipping 110 matching lines @@
         'resources/tiling_set_eviction_queue.cc',
         'resources/tiling_set_eviction_queue.h',
         'resources/tiling_set_raster_queue_all.cc',
         'resources/tiling_set_raster_queue_all.h',
         'resources/tiling_set_raster_queue_required.cc',
         'resources/tiling_set_raster_queue_required.h',
         'resources/transferable_resource.cc',
         'resources/transferable_resource.h',
         'resources/transform_display_item.cc',
         'resources/transform_display_item.h',
-        'resources/transparency_display_item.cc',
-        'resources/transparency_display_item.h',
         'resources/ui_resource_bitmap.cc',
         'resources/ui_resource_bitmap.h',
         'resources/ui_resource_client.h',
         'resources/ui_resource_request.cc',
         'resources/ui_resource_request.h',
         'resources/video_resource_updater.cc',
         'resources/video_resource_updater.h',
         'resources/zero_copy_tile_task_worker_pool.cc',
         'resources/zero_copy_tile_task_worker_pool.h',
         'scheduler/begin_frame_source.cc',
@@ skipping 93 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }