From c8c2d1901aec01e934adf561a9fdf0cc776cdef8 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 29 Jan 2018 16:35:13 +0100 Subject: BASELINE: Update Chromium to 64.0.3282.139 Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a Reviewed-by: Alexandru Croitor --- chromium/components/exo/buffer.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'chromium/components/exo/buffer.h') diff --git a/chromium/components/exo/buffer.h b/chromium/components/exo/buffer.h index 0c722beddf7..74a92bde67c 100644 --- a/chromium/components/exo/buffer.h +++ b/chromium/components/exo/buffer.h @@ -72,6 +72,12 @@ class Buffer : public base::SupportsWeakPtr { // Returns a trace value representing the state of the buffer. std::unique_ptr AsTracedValue() const; + // Set the amount of time to wait for buffer release. + void set_wait_for_release_delay_for_testing( + base::TimeDelta wait_for_release_delay) { + wait_for_release_delay_ = wait_for_release_delay; + } + private: class Texture; @@ -79,11 +85,11 @@ class Buffer : public base::SupportsWeakPtr { // client that buffer has been released. void Release(); - // This is used by ProduceTextureMailbox() to produce a release callback + // This is used by ProduceTransferableResource() to produce a release callback // that releases a texture so it can be destroyed or reused. void ReleaseTexture(std::unique_ptr texture); - // This is used by ProduceTextureMailbox() to produce a release callback + // This is used by ProduceTransferableResource() to produce a release callback // that releases the buffer contents referenced by a texture before the // texture is destroyed or reused. void ReleaseContentsTexture(std::unique_ptr texture, @@ -126,6 +132,9 @@ class Buffer : public base::SupportsWeakPtr { // is pending. base::CancelableClosure release_contents_callback_; + // The amount of time to wait for buffer release. + base::TimeDelta wait_for_release_delay_; + DISALLOW_COPY_AND_ASSIGN(Buffer); }; -- cgit v1.2.1