add_contentgpuclient_precreatemessageloop_callback.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Milan Burda <[email protected]>
  3. Date: Thu, 11 Apr 2019 14:49:20 +0200
  4. Subject: add_contentgpuclient_precreatemessageloop_callback.patch
  5. This adds a ContentGpuClient::PreCreateMessageLoop() callback.
  6. Invoke in GpuMain after SetErrorMode, before starting the message loop.
  7. Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
  8. This should be upstreamed.
  9. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
  10. index b3afa0e60f45a10cfe97b129996e1d9489b09a7d..24984b2be369908d72a9493ebb0fa0f9c3e5fc7e 100644
  11. --- a/content/gpu/gpu_main.cc
  12. +++ b/content/gpu/gpu_main.cc
  13. @@ -265,6 +265,10 @@ int GpuMain(const MainFunctionParams& parameters) {
  14. // to the GpuProcessHost once the GpuServiceImpl has started.
  15. viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  16. + auto* client = GetContentClient()->gpu();
  17. + if (client)
  18. + client->PreCreateMessageLoop();
  19. +
  20. // We are experiencing what appear to be memory-stomp issues in the GPU
  21. // process. These issues seem to be impacting the task executor and listeners
  22. // registered to it. Create the task executor on the heap to guard against
  23. @@ -402,7 +406,6 @@ int GpuMain(const MainFunctionParams& parameters) {
  24. }
  25. #endif
  26. - auto* client = GetContentClient()->gpu();
  27. if (client)
  28. client->PostIOThreadCreated(gpu_process.io_task_runner());
  29. diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
  30. index 2231ce937692f567fd2d4661e4feea389e12203e..a281c7bd40dac0acf350d08683e7c71282a83e9a 100644
  31. --- a/content/public/gpu/content_gpu_client.h
  32. +++ b/content/public/gpu/content_gpu_client.h
  33. @@ -31,6 +31,10 @@ class CONTENT_EXPORT ContentGpuClient {
  34. public:
  35. virtual ~ContentGpuClient() {}
  36. + // Allows the embedder to perform platform-specific initialization before
  37. + // creating the message loop.
  38. + virtual void PreCreateMessageLoop() {}
  39. +
  40. // Called during initialization once the GpuService has been initialized.
  41. virtual void GpuServiceInitialized() {}