Update from https://crrev.com/312398

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 88 matching lines @@
         'base/util.h',
         'debug/benchmark_instrumentation.cc',
         'debug/benchmark_instrumentation.h',
         'debug/debug_colors.cc',
         'debug/debug_colors.h',
         'debug/debug_rect_history.cc',
         'debug/debug_rect_history.h',
         'debug/devtools_instrumentation.h',
         'debug/frame_rate_counter.cc',
         'debug/frame_rate_counter.h',
+        'debug/frame_timing_tracker.cc',
+        'debug/frame_timing_tracker.h',
         'debug/frame_viewer_instrumentation.cc',
         'debug/frame_viewer_instrumentation.h',
         'debug/invalidation_benchmark.cc',
         'debug/invalidation_benchmark.h',
         'debug/lap_timer.cc',
         'debug/lap_timer.h',
         'debug/layer_tree_debug_state.cc',
         'debug/layer_tree_debug_state.h',
         'debug/micro_benchmark.cc',
         'debug/micro_benchmark.h',
@@ skipping 238 matching lines @@
         'quads/yuv_video_draw_quad.cc',
         'quads/yuv_video_draw_quad.h',
         'resources/bitmap_content_layer_updater.cc',
         'resources/bitmap_content_layer_updater.h',
         'resources/bitmap_tile_task_worker_pool.cc',
         'resources/bitmap_tile_task_worker_pool.h',
         'resources/bitmap_skpicture_content_layer_updater.cc',
         'resources/bitmap_skpicture_content_layer_updater.h',
         'resources/clip_display_item.cc',
         'resources/clip_display_item.h',
+        'resources/clip_path_display_item.cc',
+        'resources/clip_path_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 218 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }