Commit 788a8bf8 authored by Eric Karl's avatar Eric Karl Committed by Commit Bot

Android OOP-D: Avoid fatal context failures during GPU proc shutdown

OOP-D equivalent to:
https://chromium-review.googlesource.com/c/chromium/src/+/1397321

Although we don't send the fatal message during GPU proc shutdown,
Viz is already notified of GPU proc shutdown and will re-create the
context based on that signal.

Bug: 925929
Change-Id: I3add03ae9e65e09b6d2b124e25095c98a0b4362b
Reviewed-on: https://chromium-review.googlesource.com/c/1437992
Commit-Queue: Eric Karl <ericrk@chromium.org>
Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626857}
parent d0ef20a6
......@@ -150,7 +150,14 @@ std::unique_ptr<Display> GpuDisplayProvider::CreateDisplay(
if (IsFatalOrSurfaceFailure(context_result)) {
#if defined(OS_ANDROID)
display_client->OnFatalOrSurfaceContextCreationFailure(context_result);
// Ignore context creation failures if exiting for lost context. We are
// about to lose the GPU process and Viz will re-create the context at
// that point.
if (!gpu_service_impl_->gpu_channel_manager()
->is_exiting_for_lost_context()) {
display_client->OnFatalOrSurfaceContextCreationFailure(
context_result);
}
#endif
gpu_service_impl_->DisableGpuCompositing();
return nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment