Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ui/compositor/layer.h

Issue 23648014: cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: releasecallback: dchecks Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 1416f5f9602c6b52384c3713fa1947310faaed34..ec478aa27962ad5ef85767f1b30782b53f773709 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -256,7 +256,9 @@ class COMPOSITOR_EXPORT Layer
// Set new TextureMailbox for this layer. Note that |mailbox| may hold a
// shared memory resource or an actual mailbox for a texture.
- void SetTextureMailbox(const cc::TextureMailbox& mailbox, float scale_factor);
+ void SetTextureMailbox(const cc::TextureMailbox& mailbox,
+ scoped_ptr<cc::ScopedReleaseCallback> release_callback,
+ float scale_factor);
cc::TextureMailbox GetTextureMailbox(float* scale_factor);
// Sets a delegated frame, coming from a child compositor.
@@ -322,8 +324,10 @@ class COMPOSITOR_EXPORT Layer
// TextureLayerClient
virtual unsigned PrepareTexture() OVERRIDE;
virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE;
- virtual bool PrepareTextureMailbox(cc::TextureMailbox* mailbox,
- bool use_shared_memory) OVERRIDE;
+ virtual bool PrepareTextureMailbox(
+ cc::TextureMailbox* mailbox,
+ scoped_ptr<cc::ScopedReleaseCallback>* release_callback,
+ bool use_shared_memory) OVERRIDE;
float device_scale_factor() const { return device_scale_factor_; }
@@ -476,7 +480,7 @@ class COMPOSITOR_EXPORT Layer
cc::Layer* cc_layer_;
// If true, the layer scales the canvas and the texture with the device scale
- // factor as appropriate. When true, the texture size is in DIP.
+ // factor as apporpriate. When true, the texture size is in DIP.
bool scale_content_;
// A cached copy of |Compositor::device_scale_factor()|.

Powered by Google App Engine
This is Rietveld 408576698