SkiaRenderer: Call DidLoseCurrent if we can't make current

This is consistent with InProcessCommandBuffer::MakeCurrent() and
CommandBufferStub::MakeCurrent().

TBR=boliu@chromium.org

Bug: 1011420
Change-Id: I3179d229c45b5dc27586cdddfe757596d1b85ae3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866606
Commit-Queue: Jonathan Backer <backer@chromium.org>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707112}

android_webview/browser/gfx/skia_output_surface_dependency_webview.cc

@@ -118,4 +118,11 @@ void SkiaOutputSurfaceDependencyWebView::UnregisterDisplayContext(
   // No GpuChannelManagerDelegate here, so leave it no-op for now.
 }
 
+void SkiaOutputSurfaceDependencyWebView::DidLoseContext(
+    bool offscreen,
+    gpu::error::ContextLostReason reason,
+    const GURL& active_url) {
+  // No GpuChannelManagerDelegate here, so leave it no-op for now.
+}
+
 }  // namespace android_webview

android_webview/browser/gfx/skia_output_surface_dependency_webview.h

@@ -45,6 +45,9 @@ class SkiaOutputSurfaceDependencyWebView
       base::WeakPtr<gpu::ImageTransportSurfaceDelegate> stub) override;
   void RegisterDisplayContext(gpu::DisplayContext* display_context) override;
   void UnregisterDisplayContext(gpu::DisplayContext* display_context) override;
+  void DidLoseContext(bool offscreen,
+                      gpu::error::ContextLostReason reason,
+                      const GURL& active_url) override;
 
  private:
   gl::GLSurface* const gl_surface_;

components/viz/service/display_embedder/skia_output_surface_dependency.h

@@ -12,9 +12,12 @@
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "components/viz/service/viz_service_export.h"
+#include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/sequence_id.h"
 #include "gpu/ipc/common/surface_handle.h"
 
+class GURL;
+
 namespace gl {
 class GLSurface;
 }
@@ -91,6 +94,9 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurfaceDependency {
   virtual void RegisterDisplayContext(gpu::DisplayContext* display_context) = 0;
   virtual void UnregisterDisplayContext(
       gpu::DisplayContext* display_context) = 0;
+  virtual void DidLoseContext(bool offscreen,
+                              gpu::error::ContextLostReason reason,
+                              const GURL& active_url) = 0;
 };
 
 }  // namespace viz

components/viz/service/display_embedder/skia_output_surface_dependency_impl.cc

@@ -125,4 +125,11 @@ void SkiaOutputSurfaceDependencyImpl::UnregisterDisplayContext(
   gpu_service_impl_->UnregisterDisplayContext(display_context);
 }
 
+void SkiaOutputSurfaceDependencyImpl::DidLoseContext(
+    bool offscreen,
+    gpu::error::ContextLostReason reason,
+    const GURL& active_url) {
+  gpu_service_impl_->DidLoseContext(offscreen, reason, active_url);
+}
+
 }  // namespace viz

components/viz/service/display_embedder/skia_output_surface_dependency_impl.h

@@ -51,6 +51,9 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurfaceDependencyImpl
 
   void RegisterDisplayContext(gpu::DisplayContext* display_context) override;
   void UnregisterDisplayContext(gpu::DisplayContext* display_context) override;
+  void DidLoseContext(bool offscreen,
+                      gpu::error::ContextLostReason reason,
+                      const GURL& active_url) override;
 
  private:
   GpuServiceImpl* const gpu_service_impl_;

components/viz/service/display_embedder/skia_output_surface_impl.cc

@@ -86,6 +86,12 @@ base::OnceCallback<void(Args...)> CreateSafeOnceCallback(
                         std::move(callback));
 }
 
+gpu::ContextUrl& GetActiveUrl() {
+  static base::NoDestructor<gpu::ContextUrl> active_url(
+      GURL("chrome://gpu/SkiaRenderer"));
+  return *active_url;
+}
+
 }  // namespace
 
 SkiaOutputSurfaceImpl::ScopedPaint::ScopedPaint(
@@ -787,9 +793,7 @@ void SkiaOutputSurfaceImpl::ScheduleGpuTask(
     std::vector<gpu::SyncToken> sync_tokens) {
   auto wrapped_closure = base::BindOnce(
       [](base::OnceClosure callback) {
-        static base::NoDestructor<gpu::ContextUrl> active_url(
-            GURL("chrome://gpu/SkiaRenderer"));
-        gpu::ContextUrl::SetActiveUrl(*active_url);
+        gpu::ContextUrl::SetActiveUrl(GetActiveUrl());
         std::move(callback).Run();
       },
       std::move(callback));

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc

@@ -1372,6 +1372,9 @@ bool SkiaOutputSurfaceImplOnGpu::MakeCurrent(bool need_fbo0) {
     // fbo0.
     if (!context_state_->MakeCurrent(need_fbo0 ? gl_surface_.get() : nullptr)) {
       LOG(ERROR) << "Failed to make current.";
+      dependency_->DidLoseContext(
+          !need_fbo0 /* offscreen */, gpu::error::kMakeCurrentFailed,
+          GURL("chrome://gpu/SkiaOutputSurfaceImplOnGpu::MakeCurrent"));
       MarkContextLost();
       return false;
     }