Revert 174920

> Reland 174257 with fix for win_aura
> 
> win: AcceleratedPresenter replies to the GPU process as soon as shared texture is copied.
> 
> This means the GPU does not deschedule for as long waiting until it can render to the back buffer safely.
> 
> TBR=apatrick@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/11642051

Reverting to isolate performance regression on gpu_frame_rate tests on windows

TBR=apatrick@chromium.org
BUG=168470
Review URL: https://codereview.chromium.org/11782018

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

1 files changed, 5 insertions, 8 deletions

diff --git a/ui/surface/accelerated_surface_win.h b/ui/surface/accelerated_surface_win.h
index e077aae..166bf5b 100644
--- a/ui/surface/accelerated_surface_win.h
+++ b/ui/surface/accelerated_surface_win.h
@@ -26,10 +26,9 @@ class Rect;
 class SURFACE_EXPORT AcceleratedPresenter
     : public base::RefCountedThreadSafe<AcceleratedPresenter> {
  public:
-  typedef base::Callback<void(bool)> CopyCompletionTask;
-
-  typedef base::Callback<void(base::TimeTicks,
-                              base::TimeDelta)> PresentCompletionTask;
+  typedef base::Callback<void(bool,
+                              base::TimeTicks,
+                              base::TimeDelta)> CompletionTask;
 
   explicit AcceleratedPresenter(gfx::PluginWindowHandle window);
 
@@ -46,8 +45,7 @@ class SURFACE_EXPORT AcceleratedPresenter
   void AsyncPresentAndAcknowledge(
       const gfx::Size& size,
       int64 surface_handle,
-      const CopyCompletionTask& copy_completion_task,
-      const PresentCompletionTask& present_completion_task);
+      const CompletionTask& completion_task);
 
   // Schedule the presenter to free all its resources. This can be called on any
   // thread.
@@ -83,8 +81,7 @@ class SURFACE_EXPORT AcceleratedPresenter
   void DoPresentAndAcknowledge(
       const gfx::Size& size,
       int64 surface_handle,
-      const CopyCompletionTask& copy_completion_task,
-      const PresentCompletionTask& present_completion_task);
+      const CompletionTask& completion_task);
   void DoSuspend();
   void DoPresent(const base::Closure& composite_task);
   void DoReleaseSurface();