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

Unified Diff: services/ui/gpu/gpu_main.h

Issue 2525213002: Mus: Avoid deadlock during teardown (Closed)
Patch Set: Don't call DestroyDisplayCompositor during GpuServiceInternal destruction Created 4 years, 1 month 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 | « no previous file | services/ui/gpu/gpu_main.cc » ('j') | services/ui/gpu/gpu_main.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/gpu/gpu_main.h
diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h
index ede99136a4766a7cfe7ed398efa29e26ec880037..31e203e1cd0d4952315b8759ce143b08234791f3 100644
--- a/services/ui/gpu/gpu_main.h
+++ b/services/ui/gpu/gpu_main.h
@@ -29,6 +29,7 @@ class GpuMain : public gpu::GpuSandboxHelper {
private:
void InitOnGpuThread();
+ void TearDownOnCompositorThread();
void TearDownOnGpuThread();
void CreateOnGpuThread(mojom::GpuServiceInternalRequest request);
@@ -47,6 +48,9 @@ class GpuMain : public gpu::GpuSandboxHelper {
// The thread that handles IO events for GpuService.
base::Thread io_thread_;
+ // The thread used for the display compositor.
+ base::Thread compositor_thread_;
+
base::WeakPtrFactory<GpuMain> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(GpuMain);
« no previous file with comments | « no previous file | services/ui/gpu/gpu_main.cc » ('j') | services/ui/gpu/gpu_main.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698