OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'dependencies': [ | 6 'dependencies': [ |
7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
8 '../components/tracing.gyp:tracing', | 8 '../components/tracing.gyp:tracing', |
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
10 '../net/net.gyp:net', | 10 '../net/net.gyp:net', |
(...skipping 21 matching lines...) Expand all Loading... | |
32 # headers resolve correctly. | 32 # headers resolve correctly. |
33 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', | 33 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', |
34 '../ui/accessibility/accessibility.gyp:ax_gen', | 34 '../ui/accessibility/accessibility.gyp:ax_gen', |
35 ], | 35 ], |
36 'variables': { | 36 'variables': { |
37 'use_v4lplugin%': 0, | 37 'use_v4lplugin%': 0, |
38 'use_v4l2_codec%': 0, | 38 'use_v4l2_codec%': 0, |
39 'public_common_sources': [ | 39 'public_common_sources': [ |
40 'public/common/appcache_info.h', | 40 'public/common/appcache_info.h', |
41 'public/common/bindings_policy.h', | 41 'public/common/bindings_policy.h', |
42 'public/common/browser_plugin_guest_mode.cc', | |
43 'public/common/browser_plugin_guest_mode.h', | |
42 'public/common/child_process_host.h', | 44 'public/common/child_process_host.h', |
43 'public/common/child_process_host_delegate.cc', | 45 'public/common/child_process_host_delegate.cc', |
44 'public/common/child_process_host_delegate.h', | 46 'public/common/child_process_host_delegate.h', |
45 'public/common/child_process_sandbox_support_linux.h', | 47 'public/common/child_process_sandbox_support_linux.h', |
46 'public/common/color_suggestion.cc', | 48 'public/common/color_suggestion.cc', |
47 'public/common/color_suggestion.h', | 49 'public/common/color_suggestion.h', |
48 'public/common/common_param_traits.cc', | 50 'public/common/common_param_traits.cc', |
49 'public/common/common_param_traits.h', | 51 'public/common/common_param_traits.h', |
50 'public/common/common_param_traits_macros.h', | 52 'public/common/common_param_traits_macros.h', |
51 'public/common/console_message_level.h', | 53 'public/common/console_message_level.h', |
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
352 'common/gpu/media/gpu_video_encode_accelerator.cc', | 354 'common/gpu/media/gpu_video_encode_accelerator.cc', |
353 'common/gpu/media/gpu_video_encode_accelerator.h', | 355 'common/gpu/media/gpu_video_encode_accelerator.h', |
354 'common/gpu/null_transport_surface.cc', | 356 'common/gpu/null_transport_surface.cc', |
355 'common/gpu/null_transport_surface.h', | 357 'common/gpu/null_transport_surface.h', |
356 'common/gpu/stream_texture_android.cc', | 358 'common/gpu/stream_texture_android.cc', |
357 'common/gpu/stream_texture_android.h', | 359 'common/gpu/stream_texture_android.h', |
358 'common/host_discardable_shared_memory_manager.cc', | 360 'common/host_discardable_shared_memory_manager.cc', |
359 'common/host_discardable_shared_memory_manager.h', | 361 'common/host_discardable_shared_memory_manager.h', |
360 'common/host_shared_bitmap_manager.cc', | 362 'common/host_shared_bitmap_manager.cc', |
361 'common/host_shared_bitmap_manager.h', | 363 'common/host_shared_bitmap_manager.h', |
364 'common/image_messages.h', | |
Charlie Reis
2015/07/21 16:58:24
Merge conflict?
ncarter (slow)
2015/07/22 23:29:08
Very good catch. Done.
| |
365 'common/in_process_child_thread_params.cc', | |
366 'common/in_process_child_thread_params.h', | |
362 'common/indexed_db/indexed_db_constants.h', | 367 'common/indexed_db/indexed_db_constants.h', |
363 'common/indexed_db/indexed_db_key.cc', | 368 'common/indexed_db/indexed_db_key.cc', |
364 'common/indexed_db/indexed_db_key.h', | 369 'common/indexed_db/indexed_db_key.h', |
365 'common/indexed_db/indexed_db_key_path.cc', | 370 'common/indexed_db/indexed_db_key_path.cc', |
366 'common/indexed_db/indexed_db_key_path.h', | 371 'common/indexed_db/indexed_db_key_path.h', |
367 'common/indexed_db/indexed_db_key_range.cc', | 372 'common/indexed_db/indexed_db_key_range.cc', |
368 'common/indexed_db/indexed_db_key_range.h', | 373 'common/indexed_db/indexed_db_key_range.h', |
369 'common/indexed_db/indexed_db_messages.h', | 374 'common/indexed_db/indexed_db_messages.h', |
370 'common/indexed_db/indexed_db_param_traits.cc', | 375 'common/indexed_db/indexed_db_param_traits.cc', |
371 'common/indexed_db/indexed_db_param_traits.h', | 376 'common/indexed_db/indexed_db_param_traits.h', |
(...skipping 27 matching lines...) Expand all Loading... | |
399 'common/input/synthetic_web_input_event_builders.h', | 404 'common/input/synthetic_web_input_event_builders.h', |
400 'common/input/touch_event_stream_validator.cc', | 405 'common/input/touch_event_stream_validator.cc', |
401 'common/input/touch_event_stream_validator.h', | 406 'common/input/touch_event_stream_validator.h', |
402 'common/input/web_input_event_traits.cc', | 407 'common/input/web_input_event_traits.cc', |
403 'common/input/web_input_event_traits.h', | 408 'common/input/web_input_event_traits.h', |
404 'common/input/web_touch_event_traits.cc', | 409 'common/input/web_touch_event_traits.cc', |
405 'common/input/web_touch_event_traits.h', | 410 'common/input/web_touch_event_traits.h', |
406 'common/input_messages.h', | 411 'common/input_messages.h', |
407 'common/inter_process_time_ticks_converter.cc', | 412 'common/inter_process_time_ticks_converter.cc', |
408 'common/inter_process_time_ticks_converter.h', | 413 'common/inter_process_time_ticks_converter.h', |
409 'common/in_process_child_thread_params.cc', | |
410 'common/in_process_child_thread_params.h', | |
411 'common/mac/attributed_string_coder.h', | 414 'common/mac/attributed_string_coder.h', |
412 'common/mac/attributed_string_coder.mm', | 415 'common/mac/attributed_string_coder.mm', |
413 'common/mac/font_descriptor.h', | 416 'common/mac/font_descriptor.h', |
414 'common/mac/font_descriptor.mm', | 417 'common/mac/font_descriptor.mm', |
415 'common/mac/font_loader.h', | 418 'common/mac/font_loader.h', |
416 'common/mac/font_loader.mm', | 419 'common/mac/font_loader.mm', |
417 'common/mac/io_surface_manager.cc', | 420 'common/mac/io_surface_manager.cc', |
418 'common/mac/io_surface_manager.h', | 421 'common/mac/io_surface_manager.h', |
419 'common/mac/io_surface_manager_messages.h', | 422 'common/mac/io_surface_manager_messages.h', |
420 'common/mac/io_surface_manager_token.h', | 423 'common/mac/io_surface_manager_token.h', |
(...skipping 25 matching lines...) Expand all Loading... | |
446 'common/mojo/service_registry_impl.cc', | 449 'common/mojo/service_registry_impl.cc', |
447 'common/mojo/service_registry_impl.h', | 450 'common/mojo/service_registry_impl.h', |
448 'common/navigation_gesture.h', | 451 'common/navigation_gesture.h', |
449 'common/navigation_params.cc', | 452 'common/navigation_params.cc', |
450 'common/navigation_params.h', | 453 'common/navigation_params.h', |
451 'common/net/url_fetcher.cc', | 454 'common/net/url_fetcher.cc', |
452 'common/net/url_request_user_data.cc', | 455 'common/net/url_request_user_data.cc', |
453 'common/net/url_request_user_data.h', | 456 'common/net/url_request_user_data.h', |
454 'common/one_writer_seqlock.cc', | 457 'common/one_writer_seqlock.cc', |
455 'common/one_writer_seqlock.h', | 458 'common/one_writer_seqlock.h', |
459 'common/origin_util.cc', | |
456 'common/p2p_messages.h', | 460 'common/p2p_messages.h', |
457 'common/origin_util.cc', | |
458 'common/page_state_serialization.cc', | 461 'common/page_state_serialization.cc', |
459 'common/page_state_serialization.h', | 462 'common/page_state_serialization.h', |
460 'common/page_zoom.cc', | 463 'common/page_zoom.cc', |
461 'common/pepper_file_util.cc', | 464 'common/pepper_file_util.cc', |
462 'common/pepper_file_util.h', | 465 'common/pepper_file_util.h', |
463 'common/pepper_messages.h', | 466 'common/pepper_messages.h', |
464 'common/pepper_plugin_list.cc', | 467 'common/pepper_plugin_list.cc', |
465 'common/pepper_plugin_list.h', | 468 'common/pepper_plugin_list.h', |
466 'common/pepper_renderer_instance_data.cc', | 469 'common/pepper_renderer_instance_data.cc', |
467 'common/pepper_renderer_instance_data.h', | 470 'common/pepper_renderer_instance_data.h', |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
523 'common/service_worker/service_worker_client_info.h', | 526 'common/service_worker/service_worker_client_info.h', |
524 'common/service_worker/service_worker_messages.h', | 527 'common/service_worker/service_worker_messages.h', |
525 'common/service_worker/service_worker_status_code.cc', | 528 'common/service_worker/service_worker_status_code.cc', |
526 'common/service_worker/service_worker_status_code.h', | 529 'common/service_worker/service_worker_status_code.h', |
527 'common/service_worker/service_worker_types.cc', | 530 'common/service_worker/service_worker_types.cc', |
528 'common/service_worker/service_worker_types.h', | 531 'common/service_worker/service_worker_types.h', |
529 'common/set_process_title.cc', | 532 'common/set_process_title.cc', |
530 'common/set_process_title.h', | 533 'common/set_process_title.h', |
531 'common/set_process_title_linux.cc', | 534 'common/set_process_title_linux.cc', |
532 'common/set_process_title_linux.h', | 535 'common/set_process_title_linux.h', |
536 'common/site_isolation_policy.cc', | |
537 'common/site_isolation_policy.h', | |
533 'common/speech_recognition_messages.h', | 538 'common/speech_recognition_messages.h', |
534 'common/ssl_status_serialization.cc', | 539 'common/ssl_status_serialization.cc', |
535 'common/ssl_status_serialization.h', | 540 'common/ssl_status_serialization.h', |
536 'common/swapped_out_messages.cc', | 541 'common/swapped_out_messages.cc', |
537 'common/swapped_out_messages.h', | 542 'common/swapped_out_messages.h', |
538 'common/text_input_client_messages.h', | 543 'common/text_input_client_messages.h', |
539 'common/url_schemes.cc', | 544 'common/url_schemes.cc', |
540 'common/url_schemes.h', | 545 'common/url_schemes.h', |
541 'common/user_agent.cc', | 546 'common/user_agent.cc', |
542 'common/utility_messages.h', | 547 'common/utility_messages.h', |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1074 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', | 1079 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', |
1075 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc', | 1080 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc', |
1076 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h', | 1081 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h', |
1077 'common/gpu/gpu_memory_buffer_factory_ozone.cc', | 1082 'common/gpu/gpu_memory_buffer_factory_ozone.cc', |
1078 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc', | 1083 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc', |
1079 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h', | 1084 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h', |
1080 ], | 1085 ], |
1081 }], | 1086 }], |
1082 ], | 1087 ], |
1083 } | 1088 } |
OLD | NEW |