gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate.

gpu/command_buffer/client/gles2_implementation.cc

 // 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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <algorithm>
 #include <map>
@@ skipping 3267 matching lines @@
     return;
   }
 
   // TODO(gman) if id not GENned INV_OPERATION
 
   // if id does not have an object
   QueryTracker::Query* query = query_tracker_->GetQuery(id);
   if (!query) {
     query = query_tracker_->CreateQuery(id, target);
     if (!query) {
-      MustBeContextLost();

[piman, 2014/03/14 00:45:57]

I think that was the last caller. Can you remove MustBeContextLost altogether?

[danakj, 2014/03/14 01:15:49]

Oh! Done.

+      bool context_lost = helper_->IsContextLost();
+      if (!context_lost) {
+        WaitForCmd();
+        context_lost = helper_->IsContextLost();
+      }
+      if (!context_lost) {
+        SetGLError(GL_OUT_OF_MEMORY,
+                   "BeginQueryEXT",
+                   "Transfer buffer allocation failed.");
+      }
       return;
     }
   } else if (query->target() != target) {
     SetGLError(
         GL_INVALID_OPERATION, "glBeginQueryEXT", "target does not match");
     return;
   }
 
   current_queries_[target] = query;
 
@@ skipping 622 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu