diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 17:16:12 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 17:16:12 +0000 |
commit | 8dc2405798db63428fa62d2affb1cf640783c388 (patch) | |
tree | f1e65f4cc31b256762273b89a59cc4f891d0a0e4 /ui | |
parent | 70bf7b88499950447de229233d9aebaa99aa38b9 (diff) | |
download | chromium_src-8dc2405798db63428fa62d2affb1cf640783c388.zip chromium_src-8dc2405798db63428fa62d2affb1cf640783c388.tar.gz chromium_src-8dc2405798db63428fa62d2affb1cf640783c388.tar.bz2 |
Use callback_forward.h instead of callback.h where possible.
callback_forward.h will be committed separately, before this commit, and is included here only to assist in running try jobs. It will be removed before the final commit.
You are asked to review this as you have OWNERS for these files.
BUG=None
TEST=Compiles
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8699008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gfx/surface/accelerated_surface_win.cc | 4 | ||||
-rw-r--r-- | ui/gfx/surface/accelerated_surface_win.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/gfx/surface/accelerated_surface_win.cc b/ui/gfx/surface/accelerated_surface_win.cc index c3bc154..5f7330f 100644 --- a/ui/gfx/surface/accelerated_surface_win.cc +++ b/ui/gfx/surface/accelerated_surface_win.cc @@ -262,7 +262,7 @@ void AcceleratedSurface::Destroy() { void AcceleratedSurface::AsyncPresentAndAcknowledge( const gfx::Size& size, int64 surface_id, - base::Closure completion_task) { + const base::Closure& completion_task) { const int kRound = 64; gfx::Size quantized_size( std::max(1, (size.width() + kRound - 1) / kRound * kRound), @@ -429,7 +429,7 @@ void AcceleratedSurface::DoResize(const gfx::Size& size) { void AcceleratedSurface::DoPresentAndAcknowledge( const gfx::Size& size, int64 surface_id, - base::Closure completion_task) { + const base::Closure& completion_task) { TRACE_EVENT1("surface", "DoPresentAndAcknowledge", "surface_id", surface_id); HRESULT hr; diff --git a/ui/gfx/surface/accelerated_surface_win.h b/ui/gfx/surface/accelerated_surface_win.h index d1fe069..5f2dd32 100644 --- a/ui/gfx/surface/accelerated_surface_win.h +++ b/ui/gfx/surface/accelerated_surface_win.h @@ -8,7 +8,7 @@ #include <d3d9.h> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" @@ -31,7 +31,7 @@ class SURFACE_EXPORT AcceleratedSurface // this surface will be held while the completion callback runs. void AsyncPresentAndAcknowledge(const gfx::Size& size, int64 surface_id, - base::Closure completion_task); + const base::Closure& completion_task); // Synchronously present a frame with no acknowledgement. void Present(); @@ -43,7 +43,7 @@ class SURFACE_EXPORT AcceleratedSurface void DoResize(const gfx::Size& size); void DoPresentAndAcknowledge(const gfx::Size& size, int64 surface_id, - base::Closure completion_task); + const base::Closure& completion_task); // Immutable and accessible from any thread without the lock. const int thread_affinity_; |