summaryrefslogtreecommitdiffstats
path: root/ui/surface/accelerated_surface_win.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 22:30:10 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 22:30:10 +0000
commit1fd6e69803e5512f07f955c354d2254e59e78474 (patch)
tree8e70b71c5912c92a7fd94eaa608ef2f55a51646c /ui/surface/accelerated_surface_win.h
parented55546b488666e060f10b37785b64503b96eb92 (diff)
downloadchromium_src-1fd6e69803e5512f07f955c354d2254e59e78474.zip
chromium_src-1fd6e69803e5512f07f955c354d2254e59e78474.tar.gz
chromium_src-1fd6e69803e5512f07f955c354d2254e59e78474.tar.bz2
Revert "win: AcceleratedPresenter replies to the GPU process as soon as shared texture is copied."
This reverts commit ad526010baec7a1cb70b94ae0ef6c06f967007db. TBR=apatrick BUG= Review URL: https://codereview.chromium.org/11571091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface/accelerated_surface_win.h')
-rw-r--r--ui/surface/accelerated_surface_win.h13
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();