summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface_aggregator_unittest.cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2014-10-13 13:52:05 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-13 20:52:24 +0000
commit22dd9298e4365cfbc3662e98c3b387fe7f3ce6a3 (patch)
treedd30022f67c3a45551c67b2d5a1664364b3bf0c9 /cc/surfaces/surface_aggregator_unittest.cc
parent6e402f141ae341c5df18ca81e892089c47fae54f (diff)
downloadchromium_src-22dd9298e4365cfbc3662e98c3b387fe7f3ce6a3.zip
chromium_src-22dd9298e4365cfbc3662e98c3b387fe7f3ce6a3.tar.gz
chromium_src-22dd9298e4365cfbc3662e98c3b387fe7f3ce6a3.tar.bz2
gpu: Compositor management of GpuMemoryBuffer instances.
This is a refactor of the CHROMIUM_image extension that allows the compositor to map/unmap GpuMemoryBuffers on worker threads and potentially also allocate these buffers on worker threads. CreateImageCHROMIUM now takes an opaque ClientBuffer as first parameter. ClientBuffer is implementation specific and in the case of chromium a gfx::GpuMemoryBuffer. Or more specifically a content::GpuMemoryBufferImpl when used with the content layer. This allows the compositor to allocate and use GpuMemoryBuffers without a GLES2Interface. A GpuMemoryBufferManager interface has been introduced. This interface provides a mechanism for the compositor to allocate GpuMemoryBuffer instances in the renderer and browser process. BUG=418553 Review URL: https://codereview.chromium.org/634083002 Cr-Commit-Position: refs/heads/master@{#299360}
Diffstat (limited to 'cc/surfaces/surface_aggregator_unittest.cc')
-rw-r--r--cc/surfaces/surface_aggregator_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index ff1aeba..00e5b4d 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -1037,6 +1037,7 @@ class SurfaceAggregatorWithResourcesTest : public testing::Test {
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
NULL,
+ NULL,
0,
false,
1,