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

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 1249313004: Remove GPU relinquish resources infrastructure and stop GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove expecting_shutdown_. Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_process_host.h ('k') | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_process_host.cc
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 1c37f80818bda020c0877bb305a5d8b0e1bd5da3..5f29bf02d8a0bf04b85e652224a2a25a85401314 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -330,6 +330,10 @@ GpuProcessHost* GpuProcessHost::Get(GpuProcessKind kind,
if (host->Init())
return host;
+ // TODO(sievers): Revisit this behavior. It's not really a crash, but we also
+ // want the fallback-to-sw behavior if we cannot initialize the GPU.
+ RecordProcessCrash()
+
delete host;
return NULL;
}
@@ -430,8 +434,6 @@ GpuProcessHost::~GpuProcessHost() {
SendOutstandingReplies();
- RecordProcessCrash();
-
// In case we never started, clean up.
while (!queued_messages_.empty()) {
delete queued_messages_.front();
@@ -876,6 +878,10 @@ void GpuProcessHost::OnProcessLaunched() {
base::TimeTicks::Now() - init_start_time_);
}
+void GpuProcessHost::OnProcessLaunchFailed() {
+ RecordProcessCrash();
+}
+
void GpuProcessHost::OnProcessCrashed(int exit_code) {
SendOutstandingReplies();
RecordProcessCrash();
@@ -903,6 +909,10 @@ void GpuProcessHost::ForceShutdown() {
process_->ForceShutdown();
}
+void GpuProcessHost::StopGpuProcess() {
+ Send(new GpuMsg_Finalize());
+}
+
void GpuProcessHost::BeginFrameSubscription(
int surface_id,
base::WeakPtr<RenderWidgetHostViewFrameSubscriber> subscriber) {
« no previous file with comments | « content/browser/gpu/gpu_process_host.h ('k') | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698