summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorericrk <ericrk@chromium.org>2015-08-17 07:22:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-17 14:23:13 +0000
commitc9984ebe42daab4cd51fb928c32d7d1f4f14a9c7 (patch)
tree04dc6d445304b474a83e3137d3523447ab0bed9c /cc
parenta814ea088d8c8f85485b3588996605767081cd79 (diff)
downloadchromium_src-c9984ebe42daab4cd51fb928c32d7d1f4f14a9c7.zip
chromium_src-c9984ebe42daab4cd51fb928c32d7d1f4f14a9c7.tar.gz
chromium_src-c9984ebe42daab4cd51fb928c32d7d1f4f14a9c7.tar.bz2
Add GenericSharedMemoryId and use w/ GpuMemoryBuffer
Adds a GenericSharedMemoryId type which will be used to track various types of shared memory (SharedBitmap, IOSurface, base::SharedMemory). Wire up GpuMemoryBufferManager so that GpuMemoryBufferId is just a typedef of this type, setting up for further integration in the future. Note regarding message changes - We needed a way for all GenericSharedMemoryIds used by a process to be unique. Currently a renderer process sometimes internally allocates shared memory and sometimes asks the browser process to do so. In order to allow for consistent naming, we cause the Renderer process to provide an ID to the browser when asking the browser to allocate on its behalf. +tsepez for message changes. +piman for content/gpu changes +danakj/reveman for other changes. TBR=sky@chromium.org BUG=512534 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1280513002 Cr-Commit-Position: refs/heads/master@{#343677}
Diffstat (limited to 'cc')
-rw-r--r--cc/test/test_gpu_memory_buffer_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index 6648823..8d56a97 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -123,7 +123,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
}
gfx::GpuMemoryBufferId GetId() const override {
NOTREACHED();
- return 0;
+ return gfx::GpuMemoryBufferId(0);
}
gfx::GpuMemoryBufferHandle GetHandle() const override {
gfx::GpuMemoryBufferHandle handle;