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

Unified Diff: cc/resources/resource_provider.h

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: rebase Created 6 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 | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index c5488660dca6e3a24c3f08f5508c7b93ad5819e1..dc8e7b6cacada7f462c89cc7ee81ec7f215def4c 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -42,12 +42,14 @@ class GLES2Interface;
}
namespace gfx {
+class GpuMemoryBuffer;
class Rect;
class Vector2d;
}
namespace cc {
class BlockingTaskRunner;
+class GpuMemoryBufferManager;
class IdAllocator;
class SharedBitmap;
class SharedBitmapManager;
@@ -77,6 +79,7 @@ class CC_EXPORT ResourceProvider {
static scoped_ptr<ResourceProvider> Create(
OutputSurface* output_surface,
SharedBitmapManager* shared_bitmap_manager,
+ GpuMemoryBufferManager* gpu_memory_buffer_manager,
BlockingTaskRunner* blocking_main_thread_task_runner,
int highp_threshold_min,
bool use_rgba_4444_texture_format,
@@ -309,15 +312,12 @@ class CC_EXPORT ResourceProvider {
ResourceProvider::ResourceId resource_id);
~ScopedWriteLockGpuMemoryBuffer();
- void* gpu_memory_buffer() { return gpu_memory_buffer_; }
- int stride() const { return stride_; }
+ gfx::GpuMemoryBuffer* gpu_memory_buffer() { return gpu_memory_buffer_; }
private:
ResourceProvider* resource_provider_;
ResourceProvider::ResourceId resource_id_;
- unsigned image_id_;
- void* gpu_memory_buffer_;
- int stride_;
+ gfx::GpuMemoryBuffer* gpu_memory_buffer_;
DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGpuMemoryBuffer);
};
@@ -456,6 +456,7 @@ class CC_EXPORT ResourceProvider {
ResourceFormat format;
SharedBitmapId shared_bitmap_id;
SharedBitmap* shared_bitmap;
+ gfx::GpuMemoryBuffer* gpu_memory_buffer;
skia::RefPtr<SkSurface> sk_surface;
};
typedef base::hash_map<ResourceId, Resource> ResourceMap;
@@ -483,6 +484,7 @@ class CC_EXPORT ResourceProvider {
ResourceProvider(OutputSurface* output_surface,
SharedBitmapManager* shared_bitmap_manager,
+ GpuMemoryBufferManager* gpu_memory_buffer_manager,
BlockingTaskRunner* blocking_main_thread_task_runner,
int highp_threshold_min,
bool use_rgba_4444_texture_format,
@@ -531,6 +533,7 @@ class CC_EXPORT ResourceProvider {
OutputSurface* output_surface_;
SharedBitmapManager* shared_bitmap_manager_;
+ GpuMemoryBufferManager* gpu_memory_buffer_manager_;
BlockingTaskRunner* blocking_main_thread_task_runner_;
bool lost_output_surface_;
int highp_threshold_min_;
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698