summaryrefslogtreecommitdiffstats
path: root/ui/gfx/gpu_memory_buffer.cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2014-10-09 20:32:00 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-10 03:32:33 +0000
commit6f3e365094fbeeb0340f90917bde6a0a5889cce3 (patch)
tree54ccc3ce06383111894f4dc4c152e5179730e0cc /ui/gfx/gpu_memory_buffer.cc
parenta16e8bc1de2136c13428818295663cd46681e5e8 (diff)
downloadchromium_src-6f3e365094fbeeb0340f90917bde6a0a5889cce3.zip
chromium_src-6f3e365094fbeeb0340f90917bde6a0a5889cce3.tar.gz
chromium_src-6f3e365094fbeeb0340f90917bde6a0a5889cce3.tar.bz2
content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers.
This implements proper out-of-process support for SurfaceTexture backed GpuMemoryBuffers using our generic GPU service side GpuMemoryBuffer allocation mechanism. Both renderer and browser compositor usage is supported. BUG=368716,418553 TBR=jln@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/634643002 Cr-Commit-Position: refs/heads/master@{#299052}
Diffstat (limited to 'ui/gfx/gpu_memory_buffer.cc')
-rw-r--r--ui/gfx/gpu_memory_buffer.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/gfx/gpu_memory_buffer.cc b/ui/gfx/gpu_memory_buffer.cc
index 3e36cd1b..b98ae03 100644
--- a/ui/gfx/gpu_memory_buffer.cc
+++ b/ui/gfx/gpu_memory_buffer.cc
@@ -13,10 +13,6 @@ GpuMemoryBufferHandle::GpuMemoryBufferHandle()
,
io_surface_id(0u)
#endif
-#if defined(OS_ANDROID)
- ,
- buffer_id(0)
-#endif
#if defined(USE_X11)
,
pixmap(0)