summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chromium/content/browser/gpu/gpu_process_host.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc
index 8ed00b672ac..0e4ae429da5 100644
--- a/chromium/content/browser/gpu/gpu_process_host.cc
+++ b/chromium/content/browser/gpu/gpu_process_host.cc
@@ -683,6 +683,9 @@ GpuProcessHost::~GpuProcessHost() {
}
}
+ if (in_process_)
+ in_process_gpu_thread_->WaitUntilThreadStarted();
+
// If there are any remaining offscreen contexts at the point the
// GPU process exits, assume something went wrong, and block their
// URLs from accessing client 3D APIs without prompting.