Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate.

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"
 #include "gpu/command_buffer/service/logger.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 namespace gles2 {
 
 class ErrorStateImpl : public ErrorState {
  public:
-  explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger);
+  explicit ErrorStateImpl(Logger* logger);
   virtual ~ErrorStateImpl();
 
   virtual uint32 GetGLError() OVERRIDE;
 
   virtual void SetGLError(
       const char* filename,
       int line,
       unsigned int error,
       const char* function_name,
       const char* msg) OVERRIDE;
@@ skipping 26 matching lines @@
 
   virtual void ClearRealGLErrors(
       const char* filename, int line, const char* function_name) OVERRIDE;
 
  private:
   // 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);
+ErrorState* ErrorState::Create(Logger* logger) {
+  return new ErrorStateImpl(logger);
 }
 
-ErrorStateImpl::ErrorStateImpl(ErrorStateClient* client, Logger* logger)
-    : error_bits_(0), client_(client), logger_(logger) {}
+ErrorStateImpl::ErrorStateImpl(Logger* logger)
+    : error_bits_(0),
+      logger_(logger) {}
 
 ErrorStateImpl::~ErrorStateImpl() {}
 
 uint32 ErrorStateImpl::GetGLError() {
   // Check the GL error first, then our wrapped error.
   GLenum error = glGetError();
   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);
@@ skipping 26 matching lines @@
     const char* msg) {
   if (msg) {
     last_error_ = msg;
     logger_->LogMessage(
         filename, line,
         std::string("GL ERROR :") +
         GLES2Util::GetStringEnum(error) + " : " +
         function_name + ": " + msg);
   }
   error_bits_ |= GLES2Util::GLErrorToErrorBit(error);
-  if (error == GL_OUT_OF_MEMORY)
-    client_->OnOutOfMemoryError();
 }
 
 void ErrorStateImpl::SetGLErrorInvalidEnum(
     const char* filename,
     int line,
     const char* function_name,
     unsigned int value,
     const char* label) {
   SetGLError(filename, line, GL_INVALID_ENUM, function_name,
              (std::string(label) + " was " +
@@ skipping 56 matching lines @@
           GLES2Util::GetStringEnum(error) + " : " +
           function_name + ": was unhandled");
       NOTREACHED() << "GL error " << error << " was unhandled.";
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu