Reland 174257 with fix for win_aura

ui/surface/accelerated_surface_win.h

 // 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.
 
 #ifndef UI_SURFACE_ACCELERATED_SURFACE_WIN_H_
 #define UI_SURFACE_ACCELERATED_SURFACE_WIN_H_
 
 #include <d3d9.h>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/surface/surface_export.h"
 
 class PresentThread;
 
 namespace gfx {
 class Rect;
 }
 
 class SURFACE_EXPORT AcceleratedPresenter
     : public base::RefCountedThreadSafe<AcceleratedPresenter> {
  public:
-  typedef base::Callback<void(bool,
-                              base::TimeTicks,
-                              base::TimeDelta)> CompletionTask;
+  typedef base::Callback<void(bool)> CopyCompletionTask;
+
+  typedef base::Callback<void(base::TimeTicks,
+                              base::TimeDelta)> PresentCompletionTask;
 
   explicit AcceleratedPresenter(gfx::PluginWindowHandle window);
 
   // Returns a thread safe reference to the presenter for the given window or
   // null is no such presenter exists. The thread safe refptr ensures the
   // presenter will not be destroyed. This can be called on any thread.
   static scoped_refptr<AcceleratedPresenter> GetForWindow(
       gfx::PluginWindowHandle window);
 
   // Schedule a frame to be presented. The completion callback will be invoked
   // when it is safe to write to the surface on another thread. The lock for
   // this surface will be held while the completion callback runs. This can be
   // called on any thread.
   void AsyncPresentAndAcknowledge(
       const gfx::Size& size,
       int64 surface_handle,
-      const CompletionTask& completion_task);
+      const CopyCompletionTask& copy_completion_task,
+      const PresentCompletionTask& present_completion_task);
 
   // Schedule the presenter to free all its resources. This can be called on any
   // thread.
   void Suspend();
 
   // Indicates that the presenter has become invisible.
   void WasHidden();
 
   // Schedule the presenter to release its reference to the shared surface.
   void ReleaseSurface();
@@ skipping 15 matching lines @@
  private:
   friend class base::RefCountedThreadSafe<AcceleratedPresenter>;
 
   ~AcceleratedPresenter();
 
   // These member functions are called on the PresentThread with which the
   // presenter has affinity.
   void DoPresentAndAcknowledge(
       const gfx::Size& size,
       int64 surface_handle,
-      const CompletionTask& completion_task);
+      const CopyCompletionTask& copy_completion_task,
+      const PresentCompletionTask& present_completion_task);
   void DoSuspend();
   void DoPresent(const base::Closure& composite_task);
   void DoReleaseSurface();
   void DoCopyToAndAcknowledge(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       void* buf,
       scoped_refptr<base::SingleThreadTaskRunner> callback_runner,
       const base::Callback<void(bool)>& callback);
   bool DoCopyTo(const gfx::Rect& src_subrect,
@@ skipping 79 matching lines @@
 
   // Indicates that the surface has become invisible.
   void WasHidden();
 
  private:
   const scoped_refptr<AcceleratedPresenter> presenter_;
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurface);
 };
 
 #endif  // UI_SURFACE_ACCELERATED_SURFACE_WIN_H_