Update from chromium https://crrev.com/302282

gpu/command_buffer/service/error_state.cc

 // Copyright (c) 2013 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.
 
 #include "gpu/command_buffer/service/error_state.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 39 matching lines @@
 
   void CopyRealGLErrorsToWrapper(const char* filename,
                                  int line,
                                  const char* function_name) override;
 
   void ClearRealGLErrors(const char* filename,
                          int line,
                          const char* function_name) override;
 
  private:
+  GLenum GetErrorHandleContextLoss();
+
   // The last error message set.
   std::string last_error_;
   // Current GL error bits.
   uint32 error_bits_;
 
   ErrorStateClient* client_;
   Logger* logger_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorStateImpl);
 };
 
 ErrorState::ErrorState() {}
 
 ErrorState::~ErrorState() {}
 
 ErrorState* ErrorState::Create(ErrorStateClient* client, Logger* logger) {
   return new ErrorStateImpl(client, logger);
 }
 
 ErrorStateImpl::ErrorStateImpl(ErrorStateClient* client, Logger* logger)
     : error_bits_(0), client_(client), logger_(logger) {}
 
 ErrorStateImpl::~ErrorStateImpl() {}
 
 uint32 ErrorStateImpl::GetGLError() {
   // Check the GL error first, then our wrapped error.
-  GLenum error = glGetError();
+  GLenum error = GetErrorHandleContextLoss();
   if (error == GL_NO_ERROR && error_bits_ != 0) {
     for (uint32 mask = 1; mask != 0; mask = mask << 1) {
       if ((error_bits_ & mask) != 0) {
         error = GLES2Util::GLErrorBitToGLError(mask);
         break;
       }
     }
   }
 
   if (error != GL_NO_ERROR) {
     // There was an error, clear the corresponding wrapped error.
     error_bits_ &= ~GLES2Util::GLErrorToErrorBit(error);
   }
   return error;
 }
 
+GLenum ErrorStateImpl::GetErrorHandleContextLoss() {
+  GLenum error = glGetError();
+  if (error == GL_CONTEXT_LOST_KHR) {
+    client_->OnContextLostError();
+    // Do not expose GL_CONTEXT_LOST_KHR, as the version of the robustness
+    // extension that introduces the error is not exposed by the command
+    // buffer.
+    error = GL_NO_ERROR;
+  }
+  return error;
+}
+
 unsigned int ErrorStateImpl::PeekGLError(
     const char* filename, int line, const char* function_name) {
-  GLenum error = glGetError();
+  GLenum error = GetErrorHandleContextLoss();
   if (error != GL_NO_ERROR) {
     SetGLError(filename, line, error, function_name, "");
   }
   return error;
 }
 
 void ErrorStateImpl::SetGLError(
     const char* filename,
     int line,
     unsigned int error,
@@ skipping 53 matching lines @@
   SetGLError(
       filename, line, error, function_name,
       (std::string("trying to set ") +
        GLES2Util::GetStringEnum(pname) + " to " +
        base::StringPrintf("%G", param)).c_str());
 }
 
 void ErrorStateImpl::CopyRealGLErrorsToWrapper(
     const char* filename, int line, const char* function_name) {
   GLenum error;
-  while ((error = glGetError()) != GL_NO_ERROR) {
+  while ((error = GetErrorHandleContextLoss()) != GL_NO_ERROR) {
     SetGLError(filename, line, error, function_name,
                "<- error from previous GL command");
   }
 }
 
 void ErrorStateImpl::ClearRealGLErrors(
     const char* filename, int line, const char* function_name) {
   // Clears and logs all current gl errors.
   GLenum error;
   while ((error = glGetError()) != GL_NO_ERROR) {
-    if (error != GL_OUT_OF_MEMORY) {
+    if (error != GL_CONTEXT_LOST_KHR && error != GL_OUT_OF_MEMORY) {
       // GL_OUT_OF_MEMORY can legally happen on lost device.
       logger_->LogMessage(
           filename, line,
           std::string("GL ERROR :") +
           GLES2Util::GetStringEnum(error) + " : " +
           function_name + ": was unhandled");
       NOTREACHED() << "GL error " << error << " was unhandled.";
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu