Revert of Mandoline UI Process: Update namespaces and file names

components/mus/gles2/command_buffer_local.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/gles2/command_buffer_local.h"
 
 #include "base/bind.h"
 #include "components/mus/gles2/command_buffer_local_client.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_memory.h"
 #include "ui/gl/gl_surface.h"
 
-namespace mus {
+namespace gles2 {
 
 const unsigned int GL_MAP_CHROMIUM = 0x78F1;
 
-CommandBufferLocal::CommandBufferLocal(CommandBufferLocalClient* client,
-                                       gfx::AcceleratedWidget widget,
-                                       const scoped_refptr<GpuState>& gpu_state)
+CommandBufferLocal::CommandBufferLocal(
+    CommandBufferLocalClient* client,
+    gfx::AcceleratedWidget widget,
+    const scoped_refptr<gles2::GpuState>& gpu_state)
     : widget_(widget),
       gpu_state_(gpu_state),
       client_(client),
       weak_factory_(this) {}
 
 CommandBufferLocal::~CommandBufferLocal() {
   command_buffer_.reset();
   if (decoder_.get()) {
     bool have_context = decoder_->GetGLContext()->MakeCurrent(surface_.get());
     decoder_->Destroy(have_context);
@@ skipping 25 matching lines @@
     return false;
 
   if (!context_->MakeCurrent(surface_.get()))
     return false;
 
   // TODO(piman): ShaderTranslatorCache is currently per-ContextGroup but
   // only needs to be per-thread.
   bool bind_generates_resource = false;
   scoped_refptr<gpu::gles2::ContextGroup> context_group =
       new gpu::gles2::ContextGroup(
-          gpu_state_->mailbox_manager(), new GpuMemoryTracker,
+          gpu_state_->mailbox_manager(), new gles2::GpuMemoryTracker,
           new gpu::gles2::ShaderTranslatorCache,
           new gpu::gles2::FramebufferCompletenessCache, nullptr, nullptr,
           nullptr, bind_generates_resource);
 
   command_buffer_.reset(
       new gpu::CommandBufferService(context_group->transfer_buffer_manager()));
   bool result = command_buffer_->Initialize();
   DCHECK(result);
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group.get()));
@@ skipping 32 matching lines @@
 /******************************************************************************/
 
 gpu::Capabilities CommandBufferLocal::GetCapabilities() {
   return decoder_->GetCapabilities();
 }
 
 int32_t CommandBufferLocal::CreateImage(ClientBuffer buffer,
                                         size_t width,
                                         size_t height,
                                         unsigned internalformat) {
-  MojoGpuMemoryBufferImpl* gpu_memory_buffer =
-      MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
+  gles2::MojoGpuMemoryBufferImpl* gpu_memory_buffer =
+      gles2::MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
 
   scoped_refptr<gfx::GLImageMemory> image(new gfx::GLImageMemory(
       gfx::Size(static_cast<int>(width), static_cast<int>(height)),
       internalformat));
   if (!image->Initialize(
           static_cast<const unsigned char*>(gpu_memory_buffer->GetMemory()),
           gpu_memory_buffer->GetFormat())) {
     return -1;
   }
 
@@ skipping 10 matching lines @@
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   DCHECK(image_manager);
   image_manager->RemoveImage(id);
 }
 
 int32_t CommandBufferLocal::CreateGpuMemoryBufferImage(size_t width,
                                                        size_t height,
                                                        unsigned internalformat,
                                                        unsigned usage) {
   DCHECK_EQ(usage, static_cast<unsigned>(GL_MAP_CHROMIUM));
-  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)));
+  scoped_ptr<gfx::GpuMemoryBuffer> buffer(
+      gles2::MojoGpuMemoryBufferImpl::Create(
+          gfx::Size(static_cast<int>(width), static_cast<int>(height)),
+          gpu::ImageFactory::DefaultBufferFormatForImageFormat(internalformat),
+          gpu::ImageFactory::ImageUsageToGpuMemoryBufferUsage(usage)));
   if (!buffer)
     return -1;
   return CreateImage(buffer->AsClientBuffer(), width, height, internalformat);
 }
 
 uint32_t CommandBufferLocal::InsertSyncPoint() {
   return 0;
 }
 
 uint32_t CommandBufferLocal::InsertFutureSyncPoint() {
@@ skipping 74 matching lines @@
 
 void CommandBufferLocal::OnContextLost(uint32_t reason) {
   if (client_)
     client_->DidLoseContext();
 }
 
 void CommandBufferLocal::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
-}  // namespace mus
+}  // namespace gles2