| Index: content/browser/compositor/buffer_queue.h
|
| diff --git a/content/browser/compositor/buffer_queue.h b/content/browser/compositor/buffer_queue.h
|
| index 170b7bd3232b169f9face6176a2f05848a5369bb..ad985b0f127bb38fd5236c3ce9e39d1cfbd0a21a 100644
|
| --- a/content/browser/compositor/buffer_queue.h
|
| +++ b/content/browser/compositor/buffer_queue.h
|
| @@ -8,6 +8,7 @@
|
| #include <queue>
|
| #include <vector>
|
|
|
| +#include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| @@ -18,6 +19,10 @@ namespace cc {
|
| class ContextProvider;
|
| }
|
|
|
| +namespace gfx {
|
| +class GpuMemoryBuffer;
|
| +}
|
| +
|
| namespace content {
|
|
|
| class BrowserGpuMemoryBufferManager;
|
| @@ -52,12 +57,16 @@ class CONTENT_EXPORT BufferQueue {
|
| private:
|
| friend class BufferQueueTest;
|
|
|
| - struct AllocatedSurface {
|
| - AllocatedSurface() : texture(0), image(0) {}
|
| - AllocatedSurface(unsigned int texture,
|
| + struct CONTENT_EXPORT AllocatedSurface {
|
| + AllocatedSurface();
|
| + AllocatedSurface(scoped_ptr<gfx::GpuMemoryBuffer> buffer,
|
| + unsigned int texture,
|
| unsigned int image,
|
| - const gfx::Rect& rect)
|
| - : texture(texture), image(image), damage(rect) {}
|
| + const gfx::Rect& rect);
|
| + ~AllocatedSurface();
|
| + // TODO(ccameron): Change this to be a scoped_ptr, and change all use of
|
| + // AllocatedSurface to use scoped_ptr as well.
|
| + linked_ptr<gfx::GpuMemoryBuffer> buffer;
|
| unsigned int texture;
|
| unsigned int image;
|
| gfx::Rect damage; // This is the damage for this frame from the previous.
|
|
|