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

Unified Diff: content/browser/compositor/buffer_queue.h

Issue 1416363002: Mac: Always use surfaceless mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add export Created 5 years, 2 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
« no previous file with comments | « no previous file | content/browser/compositor/buffer_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | content/browser/compositor/buffer_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698