Revert 127855 - Revert 127835 - Make sure to add rescheduled message when we have unprocessed comma…

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 142 matching lines @@
       return;
     }
   }
   if (scheduler_.get())
     scheduler_->PollUnscheduleFences();
 }
 
 bool GpuCommandBufferStub::HasUnprocessedCommands() {
   if (command_buffer_.get()) {
     gpu::CommandBuffer::State state = command_buffer_->GetLastState();
-    return state.put_offset != state.get_offset;
+    return state.put_offset != state.get_offset &&
+        !gpu::error::IsError(state.error);
   }
   return false;
 }
 
 void GpuCommandBufferStub::OnEcho(const IPC::Message& message) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnEcho");
   Send(new IPC::Message(message));
 }
 
 void GpuCommandBufferStub::DelayEcho(IPC::Message* message) {
@@ skipping 456 matching lines @@
         gfx::GLSurface::BUFFER_ALLOCATION_FRONT_AND_BACK);
   else if (allocation.suggest_have_frontbuffer)
     surface_->SetBufferAllocation(
         gfx::GLSurface::BUFFER_ALLOCATION_FRONT_ONLY);
   else
     surface_->SetBufferAllocation(
         gfx::GLSurface::BUFFER_ALLOCATION_NONE);
 }
 
 #endif  // defined(ENABLE_GPU)