From bb09965444b5bb20b096a291445170876225268d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 3 May 2017 17:20:32 +0200 Subject: BASELINE: Update Chromium to 58.0.3029.98 Change-Id: Ib913750d687f29e036959c62a0cabf2412a8faa7 Reviewed-by: Alexandru Croitor --- chromium/content/common/drag_traits.h | 1 + chromium/content/common/gpu_host_messages.h | 21 +++++++++++++++++++++ chromium/content/common/sandbox_win.cc | 2 ++ 3 files changed, 24 insertions(+) (limited to 'chromium/content/common') diff --git a/chromium/content/common/drag_traits.h b/chromium/content/common/drag_traits.h index bf20e175fa0..16ea9b1e8fa 100644 --- a/chromium/content/common/drag_traits.h +++ b/chromium/content/common/drag_traits.h @@ -35,6 +35,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::DropData) IPC_STRUCT_TRAITS_MEMBER(html) IPC_STRUCT_TRAITS_MEMBER(html_base_url) IPC_STRUCT_TRAITS_MEMBER(file_contents) + IPC_STRUCT_TRAITS_MEMBER(file_contents_source_url) IPC_STRUCT_TRAITS_MEMBER(file_contents_filename_extension) IPC_STRUCT_TRAITS_MEMBER(file_contents_content_disposition) IPC_STRUCT_TRAITS_MEMBER(custom_data) diff --git a/chromium/content/common/gpu_host_messages.h b/chromium/content/common/gpu_host_messages.h index 6e76f92761f..01bf3d7f29d 100644 --- a/chromium/content/common/gpu_host_messages.h +++ b/chromium/content/common/gpu_host_messages.h @@ -45,6 +45,14 @@ IPC_STRUCT_BEGIN(GpuMsg_CreateGpuMemoryBuffer_Params) IPC_STRUCT_MEMBER(gpu::SurfaceHandle, surface_handle) IPC_STRUCT_END() +IPC_STRUCT_TRAITS_BEGIN(content::EstablishChannelParams) + IPC_STRUCT_TRAITS_MEMBER(client_id) + IPC_STRUCT_TRAITS_MEMBER(client_tracing_id) + IPC_STRUCT_TRAITS_MEMBER(preempts) + IPC_STRUCT_TRAITS_MEMBER(allow_view_command_buffers) + IPC_STRUCT_TRAITS_MEMBER(allow_real_time_streams) +IPC_STRUCT_TRAITS_END() + IPC_STRUCT_TRAITS_BEGIN(gpu::GpuPreferences) IPC_STRUCT_TRAITS_MEMBER(single_process) IPC_STRUCT_TRAITS_MEMBER(in_process_gpu) @@ -92,6 +100,15 @@ IPC_STRUCT_TRAITS_END() // Tells the GPU process to shutdown itself. IPC_MESSAGE_CONTROL0(GpuMsg_Finalize) +// Tells the GPU process to create a new channel for communication with a +// given client. The channel name is returned in a +// GpuHostMsg_ChannelEstablished message. The client ID is passed so +// that the GPU process reuses an existing channel to that process if it exists. +// This ID is a unique opaque identifier generated by the browser process. +// The client_tracing_id is a unique ID used for the purposes of tracing. +IPC_MESSAGE_CONTROL1(GpuMsg_EstablishChannel, + content::EstablishChannelParams /* params */) + // Tells the GPU process to close the channel identified by |client_id|. // If no channel can be identified, do nothing. IPC_MESSAGE_CONTROL1(GpuMsg_CloseChannel, int32_t /* client_id */) @@ -145,6 +162,10 @@ IPC_MESSAGE_CONTROL3(GpuHostMsg_Initialized, ::gpu::GPUInfo /* gpu_info */, ::gpu::GpuFeatureInfo /* gpu_feature_info */) +// Response from GPU to a GpuHostMsg_EstablishChannel message. +IPC_MESSAGE_CONTROL1(GpuHostMsg_ChannelEstablished, + IPC::ChannelHandle /* channel_handle */) + // Message to the GPU that a shader was loaded from disk. IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader, std::string /* encoded shader */) diff --git a/chromium/content/common/sandbox_win.cc b/chromium/content/common/sandbox_win.cc index 789a7a882d4..1b139b06f59 100644 --- a/chromium/content/common/sandbox_win.cc +++ b/chromium/content/common/sandbox_win.cc @@ -814,10 +814,12 @@ sandbox::ResultCode StartSandboxedProcess( } } +#if !defined(OFFICIAL_BUILD) // If stdout/stderr point to a Windows console, these calls will // have no effect. These calls can fail with SBOX_ERROR_BAD_PARAMS. policy->SetStdoutHandle(GetStdHandle(STD_OUTPUT_HANDLE)); policy->SetStderrHandle(GetStdHandle(STD_ERROR_HANDLE)); +#endif if (!delegate->PreSpawnTarget(policy.get())) return sandbox::SBOX_ERROR_DELEGATE_PRE_SPAWN; -- cgit v1.2.1