Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Side by Side Diff: content/gpu/gpu_child_thread.cc

Issue 2061953002: Do not call CollectContextGraphicsInfo if GL has failed to initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "content/gpu/gpu_child_thread.h" 5 #include "content/gpu/gpu_child_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 base::MessageLoop::current()->QuitWhenIdle(); 418 base::MessageLoop::current()->QuitWhenIdle();
419 } 419 }
420 420
421 void GpuChildThread::StopWatchdog() { 421 void GpuChildThread::StopWatchdog() {
422 if (watchdog_thread_.get()) { 422 if (watchdog_thread_.get()) {
423 watchdog_thread_->Stop(); 423 watchdog_thread_->Stop();
424 } 424 }
425 } 425 }
426 426
427 void GpuChildThread::OnCollectGraphicsInfo() { 427 void GpuChildThread::OnCollectGraphicsInfo() {
428 if (dead_on_arrival_)
429 return;
430
428 #if defined(OS_WIN) 431 #if defined(OS_WIN)
429 // GPU full info collection should only happen on un-sandboxed GPU process 432 // GPU full info collection should only happen on un-sandboxed GPU process
430 // or single process/in-process gpu mode on Windows. 433 // or single process/in-process gpu mode on Windows.
431 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 434 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
432 DCHECK(command_line->HasSwitch(switches::kDisableGpuSandbox) || 435 DCHECK(command_line->HasSwitch(switches::kDisableGpuSandbox) ||
433 in_browser_process_); 436 in_browser_process_);
434 #endif // OS_WIN 437 #endif // OS_WIN
435 438
436 gpu::CollectInfoResult result = 439 gpu::CollectInfoResult result =
437 gpu::CollectContextGraphicsInfo(&gpu_info_); 440 gpu::CollectContextGraphicsInfo(&gpu_info_);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 570
568 void GpuChildThread::BindProcessControlRequest( 571 void GpuChildThread::BindProcessControlRequest(
569 mojo::InterfaceRequest<mojom::ProcessControl> request) { 572 mojo::InterfaceRequest<mojom::ProcessControl> request) {
570 DVLOG(1) << "GPU: Binding ProcessControl request"; 573 DVLOG(1) << "GPU: Binding ProcessControl request";
571 DCHECK(process_control_); 574 DCHECK(process_control_);
572 process_control_bindings_.AddBinding(process_control_.get(), 575 process_control_bindings_.AddBinding(process_control_.get(),
573 std::move(request)); 576 std::move(request));
574 } 577 }
575 578
576 } // namespace content 579 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698