Fix a bug in the implementation of DescheduleUntilFinishedCHROMIUM.

gpu/command_buffer/service/gles2_cmd_decoder.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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 605 matching lines @@
     return vertex_array_manager_.get();
   }
   ImageManager* GetImageManager() override { return image_manager_.get(); }
 
   bool HasPendingQueries() const override;
   void ProcessPendingQueries(bool did_finish) override;
 
   bool HasMoreIdleWork() const override;
   void PerformIdleWork() override;
 
+  bool HasPollingWork() const override;
+  void PerformPollingWork() override;
+
   void WaitForReadPixels(base::Closure callback) override;
 
   Logger* GetLogger() override;
 
   void BeginDecoding() override;
   void EndDecoding() override;
 
   ErrorState* GetErrorState() override;
   const ContextState* GetContextState() override { return &state_; }
 
@@ skipping 13402 matching lines @@
   if (!deschedule_until_finished_fence_->HasCompleted())
     return;
 
   TRACE_EVENT_ASYNC_END0("cc", "GLES2DecoderImpl::DescheduleUntilFinished",
                          this);
   deschedule_until_finished_fence_.reset();
   reschedule_after_finished_callback_.Run();
 }
 
 bool GLES2DecoderImpl::HasMoreIdleWork() const {
-  return deschedule_until_finished_fence_ ||
-         !pending_readpixel_fences_.empty() ||
+  return !pending_readpixel_fences_.empty() ||
          gpu_tracer_->HasTracesToProcess();
 }
 
 void GLES2DecoderImpl::PerformIdleWork() {
   gpu_tracer_->ProcessTraces();
   ProcessPendingReadPixels(false);
+}
+
+bool GLES2DecoderImpl::HasPollingWork() const {
+  return !!deschedule_until_finished_fence_.get();
+}
+
+void GLES2DecoderImpl::PerformPollingWork() {
   ProcessDescheduleUntilFinished();
 }
 
 error::Error GLES2DecoderImpl::HandleBeginQueryEXT(uint32_t immediate_data_size,
                                                    const void* cmd_data) {
   const gles2::cmds::BeginQueryEXT& c =
       *static_cast<const gles2::cmds::BeginQueryEXT*>(cmd_data);
   GLenum target = static_cast<GLenum>(c.target);
   GLuint client_id = static_cast<GLuint>(c.id);
   int32_t sync_shm_id = static_cast<int32_t>(c.sync_data_shm_id);
@@ skipping 2951 matching lines @@
 }
 
 // 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 "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu