diff options
| author | thakis <thakis@chromium.org> | 2015-09-16 19:48:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 02:49:24 +0000 |
| commit | 35b19f7d5d7b7b68878d6c766e93e148f8b06998 (patch) | |
| tree | 546289030a5e80740af920e59ce31827d907bd2a /mojo/gles2/command_buffer_client_impl.cc | |
| parent | eef6f20ef572c4c128612384a63384aaa7d23fe7 (diff) | |
| download | chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.zip chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.gz chromium_src-35b19f7d5d7b7b68878d6c766e93e148f8b06998.tar.bz2 | |
Revert of Mandoline UI Process: Update namespaces and file names (patchset #9 id:150001 of https://codereview.chromium.org/1340983002/ )
Reason for revert:
Speculative, might've broken mojo_apptests on http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32066
Original issue's description:
> Mandoline UI Process: Update namespaces and file names
>
> This CL updates namespaces in components/mus to mus from mojo, surfaces, gles2, and view_manager.
>
> BUG=531533
> TBR=jam@chromium.org for trivial pdf_viewer change.
>
> Committed: https://crrev.com/49b0d73f3ebb4801fc518751145504af3a2f70ed
> Cr-Commit-Position: refs/heads/master@{#349229}
TBR=sky@chromium.org,fsamuel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=531533
Review URL: https://codereview.chromium.org/1351013002
Cr-Commit-Position: refs/heads/master@{#349332}
Diffstat (limited to 'mojo/gles2/command_buffer_client_impl.cc')
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index d2767ff..b639f6e 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -238,7 +238,7 @@ scoped_refptr<gpu::Buffer> CommandBufferClientImpl::CreateTransferBuffer( *id, duped.Pass(), static_cast<uint32_t>(size)); scoped_ptr<gpu::BufferBacking> backing( - new mus::MojoBufferBacking(handle.Pass(), memory, size)); + new MojoBufferBacking(handle.Pass(), memory, size)); scoped_refptr<gpu::Buffer> buffer(new gpu::Buffer(backing.Pass())); return buffer; } @@ -261,8 +261,8 @@ int32_t CommandBufferClientImpl::CreateImage(ClientBuffer buffer, size->width = static_cast<int32_t>(width); size->height = static_cast<int32_t>(height); - mus::MojoGpuMemoryBufferImpl* gpu_memory_buffer = - mus::MojoGpuMemoryBufferImpl::FromClientBuffer(buffer); + MojoGpuMemoryBufferImpl* gpu_memory_buffer = + MojoGpuMemoryBufferImpl::FromClientBuffer(buffer); gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle(); bool requires_sync_point = false; @@ -312,7 +312,7 @@ int32_t CommandBufferClientImpl::CreateGpuMemoryBufferImage( size_t height, unsigned internalformat, unsigned usage) { - scoped_ptr<gfx::GpuMemoryBuffer> buffer(mus::MojoGpuMemoryBufferImpl::Create( + scoped_ptr<gfx::GpuMemoryBuffer> buffer(MojoGpuMemoryBufferImpl::Create( gfx::Size(static_cast<int>(width), static_cast<int>(height)), gpu::ImageFactory::DefaultBufferFormatForImageFormat(internalformat), gpu::ImageFactory::ImageUsageToGpuMemoryBufferUsage(usage))); |