Thanks to piman, added necessary glFlush to the IOSurface code path on

the Mac. This was the root cause of the delay in transmission of
rendering results from the GPU process to the browser process.

Undid the changes from the fix for Issue 80602; they are no longer
needed.

Reran various test cases on Mac; no regressions.

BUG=81740
TEST=none
Review URL: http://codereview.chromium.org/6931046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84353 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 8 deletions

diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 5ea5523..aa94fbb 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -691,11 +691,7 @@ void GLES2Implementation::SwapBuffers() {
   }
   helper_->SwapBuffers();
   swap_buffers_tokens_.push(helper_->InsertToken());
-#if !defined(OS_MACOSX)
-  // TODO(kbr): restructure the swap buffers path on Mac OS X and
-  // remove this conditional.
   helper_->YieldScheduler();
-#endif
   Flush();
 }
 
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index 66fe5e0..ebb2368 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -127,10 +127,6 @@ class GpuScheduler : public CommandBufferEngine {
   // Get the GLES2Decoder associated with this scheduler.
   gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
 
-  // Helper which causes a call to ProcessCommands to be scheduled later.
-  // TODO(apatrick): figure out a way to make this private again.
-  void ScheduleProcessCommands();
-
  protected:
   // Perform common initialization. Takes ownership of GLContext.
   bool InitializeCommon(
@@ -144,6 +140,9 @@ class GpuScheduler : public CommandBufferEngine {
 
 
  private:
+  // Helper which causes a call to ProcessCommands to be scheduled later.
+  void ScheduleProcessCommands();
+
   // Called via a callback just before we are supposed to call the
   // user's swap buffers callback.
   void WillSwapBuffers();