| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index 0da00b1f53c252b6faea95403f81ef88539e42bf..288aa29f28adc24be415a0d07e98c7c6f91654ab 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -146,12 +146,14 @@ GpuChildThread::GpuChildThread(
|
| std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread,
|
| bool dead_on_arrival,
|
| const gpu::GPUInfo& gpu_info,
|
| + const gpu::GPUFeatureStatus& gpu_feature_status,
|
| const DeferredMessages& deferred_messages,
|
| gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
|
| : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)),
|
| dead_on_arrival_(dead_on_arrival),
|
| watchdog_thread_(std::move(watchdog_thread)),
|
| gpu_info_(gpu_info),
|
| + gpu_feature_status_(std::move(gpu_feature_status)),
|
| deferred_messages_(deferred_messages),
|
| in_browser_process_(false),
|
| gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
|
| @@ -164,6 +166,7 @@ GpuChildThread::GpuChildThread(
|
| GpuChildThread::GpuChildThread(
|
| const InProcessChildThreadParams& params,
|
| const gpu::GPUInfo& gpu_info,
|
| + const gpu::GPUFeatureStatus& gpu_feature_status,
|
| gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
|
| : ChildThreadImpl(ChildThreadImpl::Options::Builder()
|
| .InBrowserProcess(params)
|
| @@ -173,6 +176,7 @@ GpuChildThread::GpuChildThread(
|
| .Build()),
|
| dead_on_arrival_(false),
|
| gpu_info_(gpu_info),
|
| + gpu_feature_status_(std::move(gpu_feature_status)),
|
| in_browser_process_(true),
|
| gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
|
| #if defined(OS_WIN)
|
| @@ -321,7 +325,8 @@ void GpuChildThread::OnInitialize(const gpu::GpuPreferences& gpu_preferences) {
|
| // Record initialization only after collecting the GPU info because that can
|
| // take a significant amount of time.
|
| gpu_info_.initialization_time = base::Time::Now() - process_start_time_;
|
| - Send(new GpuHostMsg_Initialized(!dead_on_arrival_, gpu_info_));
|
| + Send(new GpuHostMsg_Initialized(!dead_on_arrival_, gpu_info_,
|
| + gpu_feature_status_));
|
| while (!deferred_messages_.empty()) {
|
| const LogMessage& log = deferred_messages_.front();
|
| Send(new GpuHostMsg_OnLogMessage(log.severity, log.header, log.message));
|
|
|