'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink_headers.gyp:blink_headers',
'../third_party/icu/icu.gyp:icuuc',
- '../third_party/libjingle/libjingle.gyp:libjingle',
'../ui/accessibility/accessibility.gyp:accessibility',
'../ui/base/ui_base.gyp:ui_base',
'../ui/events/ipc/events_ipc.gyp:events_ipc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
+ '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'../url/url.gyp:url_lib',
],
],
'variables': {
'public_common_sources': [
+ 'public/common/appcache_info.h',
'public/common/bindings_policy.h',
'public/common/child_process_host.h',
'public/common/child_process_host_delegate.cc',
'public/common/pepper_plugin_info.cc',
'public/common/pepper_plugin_info.h',
'public/common/process_type.h',
+ 'public/common/push_messaging_status.cc',
+ 'public/common/push_messaging_status.h',
'public/common/referrer.h',
'public/common/renderer_preferences.cc',
'public/common/renderer_preferences.h',
'public/common/resource_response.h',
'public/common/resource_response_info.cc',
'public/common/resource_response_info.h',
+ 'public/common/resource_type.cc',
+ 'public/common/resource_type.h',
'public/common/result_codes.h',
'public/common/result_codes_list.h',
'public/common/sandbox_init.h',
'public/common/sandboxed_process_launcher_delegate.cc',
'public/common/sandboxed_process_launcher_delegate.h',
'public/common/security_style.h',
+ 'public/common/service_registry.h',
'public/common/show_desktop_notification_params.cc',
'public/common/show_desktop_notification_params.h',
'public/common/signed_certificate_timestamp_id_and_status.cc',
'public/common/url_utils.cc',
'public/common/url_utils.h',
'public/common/user_agent.h',
+ 'public/common/web_preferences.cc',
+ 'public/common/web_preferences.h',
'public/common/webplugininfo.cc',
'public/common/webplugininfo.h',
'public/common/window_container_type.cc',
'common/android/address_parser_internal.h',
'common/android/common_jni_registrar.cc',
'common/android/common_jni_registrar.h',
+ 'common/android/gin_java_bridge_errors.cc',
+ 'common/android/gin_java_bridge_errors.h',
'common/android/gin_java_bridge_value.cc',
'common/android/gin_java_bridge_value.h',
'common/android/hash_set.cc',
'common/android/surface_texture_lookup.h',
'common/android/surface_texture_peer.cc',
'common/android/surface_texture_peer.h',
+ 'common/appcache_interfaces.cc',
+ 'common/appcache_interfaces.h',
'common/appcache_messages.h',
'common/battery_status_messages.h',
'common/browser_plugin/browser_plugin_constants.cc',
'common/database_messages.h',
'common/date_time_suggestion.h',
'common/desktop_notification_messages.h',
+ 'common/device_sensors/device_light_data.h',
+ 'common/device_sensors/device_light_hardware_buffer.h',
+ 'common/device_sensors/device_light_messages.h',
'common/device_sensors/device_motion_hardware_buffer.h',
'common/device_sensors/device_motion_messages.h',
'common/device_sensors/device_orientation_hardware_buffer.h',
'common/gpu/client/gpu_memory_buffer_impl_android.cc',
'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
'common/gpu/client/gpu_memory_buffer_impl_mac.cc',
- 'common/gpu/client/gpu_memory_buffer_impl_shm.cc',
- 'common/gpu/client/gpu_memory_buffer_impl_shm.h',
+ 'common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc',
+ 'common/gpu/client/gpu_memory_buffer_impl_shared_memory.h',
'common/gpu/client/gpu_memory_buffer_impl_win.cc',
'common/gpu/client/gpu_video_decode_accelerator_host.cc',
'common/gpu/client/gpu_video_decode_accelerator_host.h',
'common/gpu/gpu_command_buffer_stub.cc',
'common/gpu/gpu_command_buffer_stub.h',
'common/gpu/gpu_config.h',
+ 'common/gpu/gpu_memory_buffer_factory.h',
+ 'common/gpu/gpu_memory_buffer_factory_android.cc',
+ 'common/gpu/gpu_memory_buffer_factory_mac.cc',
+ 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
+ 'common/gpu/gpu_memory_buffer_factory_win.cc',
+ 'common/gpu/gpu_memory_buffer_factory_x11.cc',
'common/gpu/gpu_memory_manager.cc',
'common/gpu/gpu_memory_manager.h',
'common/gpu/gpu_memory_manager_client.cc',
'common/gpu/image_transport_surface.cc',
'common/gpu/image_transport_surface.h',
'common/gpu/image_transport_surface_android.cc',
- 'common/gpu/image_transport_surface_fbo_mac.cc',
+ 'common/gpu/image_transport_surface_calayer_mac.mm',
+ 'common/gpu/image_transport_surface_calayer_mac.h',
+ 'common/gpu/image_transport_surface_fbo_mac.mm',
'common/gpu/image_transport_surface_fbo_mac.h',
'common/gpu/image_transport_surface_linux.cc',
'common/gpu/image_transport_surface_mac.mm',
'common/gpu/media/gpu_video_encode_accelerator.h',
'common/gpu/stream_texture_android.cc',
'common/gpu/stream_texture_android.h',
+ 'common/gpu/surface_handle_types_mac.cc',
+ 'common/gpu/surface_handle_types_mac.h',
'common/gpu/sync_point_manager.cc',
'common/gpu/sync_point_manager.h',
'common/gpu/texture_image_transport_surface.cc',
'common/indexed_db/indexed_db_messages.h',
'common/indexed_db/indexed_db_param_traits.cc',
'common/indexed_db/indexed_db_param_traits.h',
+ 'common/input/did_overscroll_params.cc',
'common/input/did_overscroll_params.h',
'common/input/gesture_event_stream_validator.cc',
'common/input/gesture_event_stream_validator.h',
'common/input_messages.h',
'common/inter_process_time_ticks_converter.cc',
'common/inter_process_time_ticks_converter.h',
- 'common/java_bridge_messages.h',
'common/mac/attributed_string_coder.h',
'common/mac/attributed_string_coder.mm',
'common/mac/font_descriptor.h',
'common/message_router.h',
'common/mime_registry_messages.h',
'common/mojo/mojo_messages.h',
- 'common/mojo/mojo_service_names.cc',
- 'common/mojo/mojo_service_names.h',
+ 'common/mojo/service_registry_impl.cc',
+ 'common/mojo/service_registry_impl.h',
'common/navigation_gesture.h',
'common/net/url_fetcher.cc',
'common/net/url_request_user_data.cc',
'common/page_state_serialization.cc',
'common/page_state_serialization.h',
'common/page_zoom.cc',
+ 'common/pepper_file_util.cc',
+ 'common/pepper_file_util.h',
'common/pepper_messages.h',
'common/pepper_plugin_list.cc',
'common/pepper_plugin_list.h',
'common/pepper_renderer_instance_data.cc',
'common/pepper_renderer_instance_data.h',
- 'common/plugin_carbon_interpose_constants_mac.cc',
- 'common/plugin_carbon_interpose_constants_mac.h',
+ 'common/platform_notification_messages.h',
'common/plugin_constants_win.cc',
'common/plugin_constants_win.h',
'common/plugin_list.cc',
'common/sandbox_linux/bpf_ppapi_policy_linux.h',
'common/sandbox_linux/bpf_renderer_policy_linux.cc',
'common/sandbox_linux/bpf_renderer_policy_linux.h',
+ 'common/sandbox_linux/bpf_utility_policy_linux.cc',
+ 'common/sandbox_linux/bpf_utility_policy_linux.h',
'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
'common/sandbox_linux/sandbox_init_linux.cc',
'common/url_schemes.cc',
'common/url_schemes.h',
'common/user_agent.cc',
- 'common/user_agent_ios.mm',
'common/utility_messages.h',
'common/view_message_enums.h',
'common/view_messages.h',
'../gpu/gpu.gyp:gpu_ipc',
'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
'../ipc/ipc.gyp:ipc',
+ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
'../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
- '../mojo/mojo.gyp:mojo_environment_chromium',
- '../mojo/mojo.gyp:mojo_system_impl',
+ '../mojo/mojo_base.gyp:mojo_application_bindings',
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_base.gyp:mojo_system_impl',
'../third_party/WebKit/public/blink.gyp:blink',
'../ui/gl/gl.gyp:gl',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
}],
['OS=="mac"', {
'dependencies': [
- '../webkit/webkit_resources.gyp:webkit_resources',
+ '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
],
'sources': [
'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
+ 'common/gpu/media/vt.h',
'common/gpu/media/vt_video_decode_accelerator.cc',
'common/gpu/media/vt_video_decode_accelerator.h',
],
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
],
},
+ 'variables': {
+ 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
+ 'extra_header': 'common/gpu/media/vt_stubs_header.fragment',
+ 'sig_files': ['common/gpu/media/vt.sig'],
+ 'outfile_type': 'posix_stubs',
+ 'stubs_filename_root': 'vt_stubs',
+ 'project_path': 'content/common/gpu/media',
+ 'intermediate_dir': '<(INTERMEDIATE_DIR)',
+ 'output_root': '<(SHARED_INTERMEDIATE_DIR)/vt_stubs',
+ },
+ 'include_dirs': [
+ '<(output_root)',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'generate_stubs',
+ 'inputs': [
+ '<(generate_stubs_script)',
+ '<(extra_header)',
+ '<@(sig_files)',
+ ],
+ 'outputs': [
+ '<(intermediate_dir)/<(stubs_filename_root).cc',
+ '<(output_root)/<(project_path)/<(stubs_filename_root).h',
+ ],
+ 'action': ['python',
+ '<(generate_stubs_script)',
+ '-i', '<(intermediate_dir)',
+ '-o', '<(output_root)/<(project_path)',
+ '-t', '<(outfile_type)',
+ '-e', '<(extra_header)',
+ '-s', '<(stubs_filename_root)',
+ '-p', '<(project_path)',
+ '<@(_inputs)',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'message': 'Generating VideoToolbox stubs for dynamic loading',
+ },
+ ],
}],
['OS=="android"',{
'sources': [
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:xcomposite',
],
+ 'sources': [
+ 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.cc',
+ 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.h',
+ ],
}],
['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
'sources': [
'common/gpu/media/android_video_encode_accelerator.h',
],
}],
+ ['enable_webrtc==1', {
+ 'dependencies': [
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ ],
+ }],
['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
'dependencies': [
'../media/media.gyp:media',
'<(DEPTH)/third_party/khronos',
],
}],
- ['target_arch != "arm" and use_x11 == 1', {
+ ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+ 'dependencies': [
+ '../media/media.gyp:media',
+ '../third_party/libyuv/libyuv.gyp:libyuv',
+ ],
'sources': [
'common/gpu/media/h264_dpb.cc',
'common/gpu/media/h264_dpb.h',
'common/gpu/media/vaapi_h264_decoder.h',
'common/gpu/media/vaapi_video_decode_accelerator.cc',
'common/gpu/media/vaapi_video_decode_accelerator.h',
+ 'common/gpu/media/vaapi_video_encode_accelerator.cc',
+ 'common/gpu/media/vaapi_video_encode_accelerator.h',
'common/gpu/media/vaapi_wrapper.cc',
'common/gpu/media/vaapi_wrapper.h',
],
},
'include_dirs': [
'<(DEPTH)/third_party/libva',
+ '<(DEPTH)/third_party/libyuv',
'<(output_root)',
],
'actions': [
'common/sandbox_linux/bpf_ppapi_policy_linux.h',
'common/sandbox_linux/bpf_renderer_policy_linux.cc',
'common/sandbox_linux/bpf_renderer_policy_linux.h',
+ 'common/sandbox_linux/bpf_utility_policy_linux.cc',
+ 'common/sandbox_linux/bpf_utility_policy_linux.h',
'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
],
['use_ozone==1', {
'dependencies': [
'../ui/ozone/ozone.gyp:ozone',
+ '../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu',
],
}],
],