Index: components/mus/gles2/command_buffer_driver.cc |
diff --git a/components/view_manager/gles2/command_buffer_driver.cc b/components/mus/gles2/command_buffer_driver.cc |
similarity index 94% |
rename from components/view_manager/gles2/command_buffer_driver.cc |
rename to components/mus/gles2/command_buffer_driver.cc |
index 7bf92b07008f9df4c3ef16f453b79daf3f90b905..7207b037228901aa4f086a5b72f93c8811201d1a 100644 |
--- a/components/view_manager/gles2/command_buffer_driver.cc |
+++ b/components/mus/gles2/command_buffer_driver.cc |
@@ -2,15 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/view_manager/gles2/command_buffer_driver.h" |
+#include "components/mus/gles2/command_buffer_driver.h" |
#include "base/bind.h" |
#include "base/macros.h" |
#include "base/memory/shared_memory.h" |
-#include "components/view_manager/gles2/command_buffer_type_conversions.h" |
-#include "components/view_manager/gles2/gpu_memory_tracker.h" |
-#include "components/view_manager/gles2/gpu_state.h" |
-#include "components/view_manager/gles2/mojo_buffer_backing.h" |
+#include "components/mus/gles2/command_buffer_type_conversions.h" |
+#include "components/mus/gles2/gpu_memory_tracker.h" |
+#include "components/mus/gles2/gpu_state.h" |
+#include "components/mus/gles2/mojo_buffer_backing.h" |
#include "gpu/command_buffer/common/constants.h" |
#include "gpu/command_buffer/common/value_state.h" |
#include "gpu/command_buffer/service/command_buffer_service.h" |
@@ -34,14 +34,10 @@ |
namespace gles2 { |
-CommandBufferDriver::Client::~Client() { |
-} |
+CommandBufferDriver::Client::~Client() {} |
CommandBufferDriver::CommandBufferDriver(scoped_refptr<GpuState> gpu_state) |
- : client_(nullptr), |
- gpu_state_(gpu_state), |
- weak_factory_(this) { |
-} |
+ : client_(nullptr), gpu_state_(gpu_state), weak_factory_(this) {} |
CommandBufferDriver::~CommandBufferDriver() { |
DestroyDecoder(); |
@@ -211,7 +207,7 @@ void CommandBufferDriver::CreateImage(int32_t id, |
gfx::Size gfx_size = size.To<gfx::Size>(); |
if (!gpu::ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat( |
- gfx_size, gpu_format)) { |
+ gfx_size, gpu_format)) { |
LOG(ERROR) << "Invalid image size for format."; |
return; |
} |
@@ -234,8 +230,7 @@ void CommandBufferDriver::CreateImage(int32_t id, |
MojoPlatformHandle platform_handle; |
MojoResult extract_result = MojoExtractPlatformHandle( |
- memory_handle.release().value(), |
- &platform_handle); |
+ memory_handle.release().value(), &platform_handle); |
if (extract_result != MOJO_RESULT_OK) { |
NOTREACHED(); |
return; |