Commit 1965c9de authored by reveman@chromium.org's avatar reveman@chromium.org

content: Fix incorrect GpuMemoryBufferFactoryX11Pixmap function name.

BUG=
TBR=piman@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/412383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285380 0039d316-1c4b-4281-b951-d872f2087c98
parent 9cdf1f04
...@@ -56,11 +56,11 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory { ...@@ -56,11 +56,11 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
return image; return image;
} }
case gfx::X11_PIXMAP_BUFFER: case gfx::X11_PIXMAP_BUFFER:
// Verify that client is the owner of the buffer we're about to acquire. // Verify that client is the owner of the buffer we're about to use.
if (handle.global_id.secondary_id != client_id) if (handle.global_id.secondary_id != client_id)
return scoped_refptr<gfx::GLImage>(); return scoped_refptr<gfx::GLImage>();
return x11_pixmap_factory_.AcquireImageForGpuMemoryBuffer( return x11_pixmap_factory_.CreateImageForGpuMemoryBuffer(
handle.global_id, size, internalformat); handle.global_id, size, internalformat);
default: default:
NOTREACHED(); NOTREACHED();
......
...@@ -31,7 +31,7 @@ void GpuMemoryBufferFactoryX11Pixmap::DestroyGpuMemoryBuffer( ...@@ -31,7 +31,7 @@ void GpuMemoryBufferFactoryX11Pixmap::DestroyGpuMemoryBuffer(
} }
scoped_refptr<gfx::GLImage> scoped_refptr<gfx::GLImage>
GpuMemoryBufferFactoryX11Pixmap::AcquireImageForGpuMemoryBuffer( GpuMemoryBufferFactoryX11Pixmap::CreateImageForGpuMemoryBuffer(
const gfx::GpuMemoryBufferId& id, const gfx::GpuMemoryBufferId& id,
const gfx::Size& size, const gfx::Size& size,
unsigned internalformat) { unsigned internalformat) {
......
...@@ -29,7 +29,7 @@ class GpuMemoryBufferFactoryX11Pixmap { ...@@ -29,7 +29,7 @@ class GpuMemoryBufferFactoryX11Pixmap {
void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferId& id); void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferId& id);
// Creates a GLImage instance for a GPU memory buffer. // Creates a GLImage instance for a GPU memory buffer.
scoped_refptr<gfx::GLImage> AcquireImageForGpuMemoryBuffer( scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
const gfx::GpuMemoryBufferId& id, const gfx::GpuMemoryBufferId& id,
const gfx::Size& size, const gfx::Size& size,
unsigned internalformat); unsigned internalformat);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment