Report lost context from GLES2Implementation based on share group state.

gpu/ipc/client/command_buffer_proxy_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
 #define GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 83 matching lines @@
                       size_t width,
                       size_t height,
                       unsigned internal_format) override;
   void DestroyImage(int32_t id) override;
   int32_t CreateGpuMemoryBufferImage(size_t width,
                                      size_t height,
                                      unsigned internal_format,
                                      unsigned usage) override;
   void SignalQuery(uint32_t query, const base::Closure& callback) override;
   void SetLock(base::Lock* lock) override;
-  bool IsGpuChannelLost() override;
   void EnsureWorkVisible() override;
   gpu::CommandBufferNamespace GetNamespaceID() const override;
   gpu::CommandBufferId GetCommandBufferID() const override;
   int32_t GetExtraCommandBufferData() const override;
   uint64_t GenerateFenceSyncRelease() override;
   bool IsFenceSyncRelease(uint64_t release) override;
   bool IsFenceSyncFlushed(uint64_t release) override;
   bool IsFenceSyncFlushReceived(uint64_t release) override;
   void SignalSyncToken(const gpu::SyncToken& sync_token,
                        const base::Closure& callback) override;
@@ skipping 45 matching lines @@
     if (lock_)
       lock_->AssertAcquired();
   }
 
   // Send an IPC message over the GPU channel. This is private to fully
   // encapsulate the channel; all callers of this function must explicitly
   // verify that the context has not been lost.
   bool Send(IPC::Message* msg);
 
   // Message handlers:
-  void OnUpdateState(const gpu::CommandBuffer::State& state);
   void OnDestroyed(gpu::error::ContextLostReason reason,
                    gpu::error::Error error);
   void OnConsoleMessage(const GPUCommandBufferConsoleMessage& message);
   void OnSignalAck(uint32_t id);
   void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
                               gfx::SwapResult result);
   void OnUpdateVSyncParameters(base::TimeTicks timebase,
                                base::TimeDelta interval);
 
-  // Try to read an updated copy of the state from shared memory.
-  void TryUpdateState();
-
   // Updates the highest verified release fence sync.
   void UpdateVerifiedReleases(uint32_t verified_flush);
 
-  // Loses the context after we received an invalid message from the GPU
-  // process. Will call the lost context callback reentrantly if any.
-  void InvalidGpuMessage();
+  // Try to read an updated copy of the state from shared memory, and calls
+  // OnGpuStateError() if the new state has an error.
+  void TryUpdateState();
+  // Like the above but does not call the error event handler if the new state
+  // has an error.
+  void TryUpdateStateDontReportError();
+  // Sets the state, and calls OnGpuStateError() if the new state has an error.
+  void SetStateFromSyncReply(const gpu::CommandBuffer::State& state);
 
   // Loses the context after we received an invalid reply from the GPU
-  // process. Will post a task to call the lost context callback if any.
-  void InvalidGpuReply();
+  // process.
+  void OnGpuSyncReplyError();
 
-  void InvalidGpuReplyOnClientThread();
+  // Loses the context when receiving a message from the GPU process.
+  void OnGpuAsyncMessageError(gpu::error::ContextLostReason reason,
+                              gpu::error::Error error);
+
+  // Loses the context after we receive an error state from the GPU process.
+  void OnGpuStateError();
+
+  // Sets an error on the last_state_ and loses the context due to client-side
+  // errors.
+  void OnClientError(gpu::error::Error error);
+
+  // Helper methods, don't call these directly.
+  void DestroyChannelInFreshCallStack();
+  void LockAndDestroyChannel();
+  void DestroyChannel();

[piman, 2016/04/29 01:35:28]

nit: we don't really destroy the channel (it's almost certainly referenced by
something else). Not sure what's a good name. Disconnect?

[danakj, 2016/04/29 02:34:41]

Ah ya, done in Patch set 7.

 
   // The shared memory area used to update state.
   gpu::CommandBufferSharedState* shared_state() const;
 
   base::Lock* lock_;
 
   // Client that wants to listen for important events on the GpuControl.
   gpu::GpuControlClient* gpu_control_client_;
 
   // Unowned list of DeletionObservers.
@@ skipping 42 matching lines @@
 
   base::WeakPtr<CommandBufferProxyImpl> weak_this_;
   scoped_refptr<base::SequencedTaskRunner> callback_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_