Index: cc/BUILD.gn |
diff --git a/cc/BUILD.gn b/cc/BUILD.gn |
index e2988e147a497cf9ea04eb74e14742573b27095a..3f37b8b22561d93a47440c78ff810b0683dacf3a 100644 |
--- a/cc/BUILD.gn |
+++ b/cc/BUILD.gn |
@@ -7,26 +7,6 @@ import("//cc/cc.gni") |
cc_component("cc") { |
sources = [ |
- "blimp/client_picture_cache.h", |
- "blimp/compositor_proto_state.cc", |
- "blimp/compositor_proto_state.h", |
- "blimp/compositor_state_deserializer.cc", |
- "blimp/compositor_state_deserializer.h", |
- "blimp/deserialized_content_layer_client.cc", |
- "blimp/deserialized_content_layer_client.h", |
- "blimp/engine_picture_cache.h", |
- "blimp/image_serialization_processor.h", |
- "blimp/layer_factory.h", |
- "blimp/layer_tree_host_remote.cc", |
- "blimp/layer_tree_host_remote.h", |
- "blimp/picture_data.cc", |
- "blimp/picture_data.h", |
- "blimp/picture_data_conversions.cc", |
- "blimp/picture_data_conversions.h", |
- "blimp/remote_compositor_bridge.cc", |
- "blimp/remote_compositor_bridge.h", |
- "blimp/remote_compositor_bridge_client.h", |
- "blimp/synced_property_remote.h", |
"debug/benchmark_instrumentation.cc", |
"debug/benchmark_instrumentation.h", |
"debug/debug_colors.cc", |
@@ -274,8 +254,6 @@ cc_component("cc") { |
"playback/display_item_list.h", |
"playback/display_item_list_settings.cc", |
"playback/display_item_list_settings.h", |
- "playback/display_item_proto_factory.cc", |
- "playback/display_item_proto_factory.h", |
"playback/draw_image.cc", |
"playback/draw_image.h", |
"playback/drawing_display_item.cc", |
@@ -296,14 +274,6 @@ cc_component("cc") { |
"playback/skip_image_canvas.h", |
"playback/transform_display_item.cc", |
"playback/transform_display_item.h", |
- "proto/base_conversions.cc", |
- "proto/base_conversions.h", |
- "proto/cc_conversions.cc", |
- "proto/cc_conversions.h", |
- "proto/gfx_conversions.cc", |
- "proto/gfx_conversions.h", |
- "proto/skia_conversions.cc", |
- "proto/skia_conversions.h", |
"quads/content_draw_quad_base.cc", |
"quads/content_draw_quad_base.h", |
"quads/debug_border_draw_quad.cc", |
@@ -542,6 +512,9 @@ cc_component("cc") { |
] |
} |
+ # TODO(khushalsagar): Remove once crbug.com/683263 is fixed. |
+ configs = [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ |
public_deps = [ |
"//cc/base", |
"//skia", |
@@ -549,7 +522,6 @@ cc_component("cc") { |
deps = [ |
"//base", |
"//base/third_party/dynamic_annotations", |
- "//cc/proto", |
"//cc/surfaces:surface_id", |
"//gpu", |
"//gpu/command_buffer/client:gles2_implementation", |
@@ -587,20 +559,14 @@ cc_static_library("test_support") { |
"test/begin_frame_args_test.h", |
"test/begin_frame_source_test.cc", |
"test/begin_frame_source_test.h", |
- "test/fake_client_picture_cache.cc", |
- "test/fake_client_picture_cache.h", |
"test/fake_compositor_frame_sink.cc", |
"test/fake_compositor_frame_sink.h", |
"test/fake_compositor_frame_sink_client.cc", |
"test/fake_compositor_frame_sink_client.h", |
"test/fake_content_layer_client.cc", |
"test/fake_content_layer_client.h", |
- "test/fake_engine_picture_cache.cc", |
- "test/fake_engine_picture_cache.h", |
"test/fake_external_begin_frame_source.cc", |
"test/fake_external_begin_frame_source.h", |
- "test/fake_image_serialization_processor.cc", |
- "test/fake_image_serialization_processor.h", |
"test/fake_impl_task_runner_provider.h", |
"test/fake_layer_tree_host.cc", |
"test/fake_layer_tree_host.h", |
@@ -632,8 +598,6 @@ cc_static_library("test_support") { |
"test/fake_raster_source.h", |
"test/fake_recording_source.cc", |
"test/fake_recording_source.h", |
- "test/fake_remote_compositor_bridge.cc", |
- "test/fake_remote_compositor_bridge.h", |
"test/fake_rendering_stats_instrumentation.h", |
"test/fake_resource_provider.h", |
"test/fake_scoped_ui_resource.cc", |
@@ -656,8 +620,6 @@ cc_static_library("test_support") { |
"test/layer_internals_for_test.h", |
"test/layer_test_common.cc", |
"test/layer_test_common.h", |
- "test/layer_tree_host_remote_for_testing.cc", |
- "test/layer_tree_host_remote_for_testing.h", |
"test/layer_tree_json_parser.cc", |
"test/layer_tree_json_parser.h", |
"test/layer_tree_pixel_resource_test.cc", |
@@ -676,8 +638,6 @@ cc_static_library("test_support") { |
"test/ordered_texture_map.h", |
"test/paths.cc", |
"test/paths.h", |
- "test/picture_cache_model.cc", |
- "test/picture_cache_model.h", |
"test/pixel_comparator.cc", |
"test/pixel_comparator.h", |
"test/pixel_test.cc", |
@@ -690,16 +650,10 @@ cc_static_library("test_support") { |
"test/push_properties_counting_layer.h", |
"test/push_properties_counting_layer_impl.cc", |
"test/push_properties_counting_layer_impl.h", |
- "test/remote_client_layer_factory.cc", |
- "test/remote_client_layer_factory.h", |
- "test/remote_compositor_test.cc", |
- "test/remote_compositor_test.h", |
"test/render_pass_test_utils.cc", |
"test/render_pass_test_utils.h", |
"test/scheduler_test_common.cc", |
"test/scheduler_test_common.h", |
- "test/serialization_test_utils.cc", |
- "test/serialization_test_utils.h", |
"test/skia_common.cc", |
"test/skia_common.h", |
"test/solid_color_content_layer_client.cc", |
@@ -756,7 +710,6 @@ cc_static_library("test_support") { |
"//base", |
"//base/test:test_support", |
"//base/third_party/dynamic_annotations", |
- "//cc/proto", |
"//cc/surfaces", |
"//cc/surfaces:surface_id", |
"//gpu/command_buffer/client:gles2_c_lib", |
@@ -798,15 +751,9 @@ cc_test("cc_unittests") { |
"base/spiral_iterator_unittest.cc", |
"base/tiling_data_unittest.cc", |
"base/unique_notifier_unittest.cc", |
- "blimp/compositor_state_deserializer_unittest.cc", |
- "blimp/layer_tree_host_remote_unittest.cc", |
- "blimp/layer_tree_host_unittest_serialization.cc", |
- "blimp/picture_data_conversions_unittest.cc", |
- "blimp/synced_property_remote_unittest.cc", |
"debug/micro_benchmark_controller_unittest.cc", |
"debug/rendering_stats_unittest.cc", |
"input/browser_controls_offset_manager_unittest.cc", |
- "input/layer_selection_bound_unittest.cc", |
"input/scroll_state_unittest.cc", |
"input/scrollbar_animation_controller_linear_fade_unittest.cc", |
"input/scrollbar_animation_controller_thinning_unittest.cc", |
@@ -859,10 +806,6 @@ cc_test("cc_unittests") { |
"playback/image_hijack_canvas_unittest.cc", |
"playback/raster_source_unittest.cc", |
"playback/recording_source_unittest.cc", |
- "proto/base_conversions_unittest.cc", |
- "proto/cc_conversions_unittest.cc", |
- "proto/gfx_conversions_unittest.cc", |
- "proto/skia_conversions_unittest.cc", |
"quads/draw_polygon_unittest.cc", |
"quads/draw_quad_unittest.cc", |
"quads/render_pass_unittest.cc", |
@@ -960,13 +903,15 @@ cc_test("cc_unittests") { |
] |
} |
+ # TODO(khushalsagar): Remove once crbug.com/683263 is fixed. |
+ configs = [ "//build/config/compiler:no_size_t_to_int_warning" ] |
+ |
deps = [ |
":cc", |
":test_support", |
"//base/test:test_support", |
"//cc/ipc", |
"//cc/ipc:test_interfaces", |
- "//cc/proto", |
"//cc/surfaces", |
"//cc/surfaces:surface_id", |
"//cc/surfaces:surfaces", |