Revert of Splitting of layers for correct intersections

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 261 matching lines @@
         'output/copy_output_request.cc',
         'output/copy_output_request.h',
         'output/copy_output_result.cc',
         'output/copy_output_result.h',
         'output/delegated_frame_data.cc',
         'output/delegated_frame_data.h',
         'output/delegating_renderer.cc',
         'output/delegating_renderer.h',
         'output/direct_renderer.cc',
         'output/direct_renderer.h',
-        'output/dynamic_geometry_binding.cc',
-        'output/dynamic_geometry_binding.h',
         'output/filter_operation.cc',
         'output/filter_operation.h',
         'output/filter_operations.cc',
         'output/filter_operations.h',
         'output/geometry_binding.cc',
         'output/geometry_binding.h',
         'output/gl_frame_data.cc',
         'output/gl_frame_data.h',
         'output/gl_renderer.cc',
         'output/gl_renderer.h',
@@ skipping 20 matching lines @@
         'output/renderer_settings.cc',
         'output/renderer_settings.h',
         'output/shader.cc',
         'output/shader.h',
         'output/software_frame_data.cc',
         'output/software_frame_data.h',
         'output/software_output_device.cc',
         'output/software_output_device.h',
         'output/software_renderer.cc',
         'output/software_renderer.h',
-        'output/static_geometry_binding.cc',
-        'output/static_geometry_binding.h',
         'output/viewport_selection_bound.cc',
         'output/viewport_selection_bound.h',
         'output/vsync_parameter_observer.h',
         'quads/checkerboard_draw_quad.cc',
         'quads/checkerboard_draw_quad.h',
         'quads/content_draw_quad_base.cc',
         'quads/content_draw_quad_base.h',
         'quads/debug_border_draw_quad.cc',
         'quads/debug_border_draw_quad.h',
         'quads/draw_polygon.cc',
@@ skipping 190 matching lines @@
         'scheduler/scheduler_settings.cc',
         'scheduler/scheduler_settings.h',
         'scheduler/scheduler_state_machine.cc',
         'scheduler/scheduler_state_machine.h',
         'trees/blocking_task_runner.cc',
         'trees/blocking_task_runner.h',
         'trees/damage_tracker.cc',
         'trees/damage_tracker.h',
         'trees/draw_property_utils.cc',
         'trees/draw_property_utils.h',
+        'trees/layer_sorter.cc',
+        'trees/layer_sorter.h',
         'trees/layer_tree_host.cc',
         'trees/layer_tree_host.h',
         'trees/layer_tree_host_client.h',
         'trees/layer_tree_host_common.cc',
         'trees/layer_tree_host_common.h',
         'trees/layer_tree_host_impl.cc',
         'trees/layer_tree_host_impl.h',
         'trees/layer_tree_impl.cc',
         'trees/layer_tree_impl.h',
         'trees/layer_tree_settings.cc',
@@ skipping 64 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }