Move code in //services/gles2 into namespace gles2
R=sky@chromium.org
Review URL: https://codereview.chromium.org/772523004
diff --git a/services/gles2/command_buffer_driver.cc b/services/gles2/command_buffer_driver.cc
index 6d59f55..5e82854 100644
--- a/services/gles2/command_buffer_driver.cc
+++ b/services/gles2/command_buffer_driver.cc
@@ -23,7 +23,7 @@
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_surface.h"
-namespace mojo {
+namespace gles2 {
namespace {
@@ -83,17 +83,19 @@
client_->DidDestroy();
}
-void CommandBufferDriver::Initialize(CommandBufferSyncClientPtr sync_client,
- ScopedSharedBufferHandle shared_state) {
+void CommandBufferDriver::Initialize(
+ mojo::CommandBufferSyncClientPtr sync_client,
+ mojo::ScopedSharedBufferHandle shared_state) {
sync_client_ = sync_client.Pass();
bool success = DoInitialize(shared_state.Pass());
- GpuCapabilitiesPtr capabilities =
- success ? GpuCapabilities::From(decoder_->GetCapabilities())
- : GpuCapabilities::New();
+ mojo::GpuCapabilitiesPtr capabilities =
+ success ? mojo::GpuCapabilities::From(decoder_->GetCapabilities())
+ : mojo::GpuCapabilities::New();
sync_client_->DidInitialize(success, capabilities.Pass());
}
-bool CommandBufferDriver::DoInitialize(ScopedSharedBufferHandle shared_state) {
+bool CommandBufferDriver::DoInitialize(
+ mojo::ScopedSharedBufferHandle shared_state) {
if (widget_ == gfx::kNullAcceleratedWidget)
surface_ = gfx::GLSurface::CreateOffscreenGLSurface(size_);
else {
@@ -181,12 +183,12 @@
void CommandBufferDriver::MakeProgress(int32_t last_get_offset) {
// TODO(piman): handle out-of-order.
sync_client_->DidMakeProgress(
- CommandBufferState::From(command_buffer_->GetLastState()));
+ mojo::CommandBufferState::From(command_buffer_->GetLastState()));
}
void CommandBufferDriver::RegisterTransferBuffer(
int32_t id,
- ScopedSharedBufferHandle transfer_buffer,
+ mojo::ScopedSharedBufferHandle transfer_buffer,
uint32_t size) {
// Take ownership of the memory and map it into this process.
// This validates the size.
@@ -203,7 +205,7 @@
command_buffer_->DestroyTransferBuffer(id);
}
-void CommandBufferDriver::Echo(const Callback<void()>& callback) {
+void CommandBufferDriver::Echo(const mojo::Callback<void()>& callback) {
callback.Run();
}
@@ -242,4 +244,4 @@
client_->UpdateVSyncParameters(timebase, interval);
}
-} // namespace mojo
+} // namespace gles2
diff --git a/services/gles2/command_buffer_driver.h b/services/gles2/command_buffer_driver.h
index 853b12a..9305142 100644
--- a/services/gles2/command_buffer_driver.h
+++ b/services/gles2/command_buffer_driver.h
@@ -31,7 +31,7 @@
class GLSurface;
}
-namespace mojo {
+namespace gles2 {
class CommandBufferDriver {
public:
@@ -59,19 +59,19 @@
void set_client(Client* client) { client_ = client; }
- void Initialize(CommandBufferSyncClientPtr sync_client,
- ScopedSharedBufferHandle shared_state);
+ void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
+ mojo::ScopedSharedBufferHandle shared_state);
void SetGetBuffer(int32_t buffer);
void Flush(int32_t put_offset);
void MakeProgress(int32_t last_get_offset);
void RegisterTransferBuffer(int32_t id,
- ScopedSharedBufferHandle transfer_buffer,
+ mojo::ScopedSharedBufferHandle transfer_buffer,
uint32_t size);
void DestroyTransferBuffer(int32_t id);
- void Echo(const Callback<void()>& callback);
+ void Echo(const mojo::Callback<void()>& callback);
private:
- bool DoInitialize(ScopedSharedBufferHandle shared_state);
+ bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state);
void OnResize(gfx::Size size, float scale_factor);
bool OnWaitSyncPoint(uint32_t sync_point);
void OnSyncPointRetired();
@@ -81,7 +81,7 @@
const base::TimeDelta interval);
Client* client_;
- CommandBufferSyncClientPtr sync_client_;
+ mojo::CommandBufferSyncClientPtr sync_client_;
gfx::AcceleratedWidget widget_;
gfx::Size size_;
scoped_ptr<gpu::CommandBufferService> command_buffer_;
@@ -101,6 +101,6 @@
DISALLOW_COPY_AND_ASSIGN(CommandBufferDriver);
};
-} // namespace mojo
+} // namespace gles2
#endif // SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
diff --git a/services/gles2/command_buffer_impl.cc b/services/gles2/command_buffer_impl.cc
index 8cbc59f..129238c 100644
--- a/services/gles2/command_buffer_impl.cc
+++ b/services/gles2/command_buffer_impl.cc
@@ -9,13 +9,13 @@
#include "gpu/command_buffer/service/sync_point_manager.h"
#include "services/gles2/command_buffer_driver.h"
-namespace mojo {
+namespace gles2 {
namespace {
void DestroyDriver(scoped_ptr<CommandBufferDriver> driver) {
// Just let ~scoped_ptr run.
}
-void RunCallback(const Callback<void()>& callback) {
+void RunCallback(const mojo::Callback<void()>& callback) {
callback.Run();
}
@@ -49,8 +49,8 @@
}
CommandBufferImpl::CommandBufferImpl(
- InterfaceRequest<CommandBuffer> request,
- ViewportParameterListenerPtr listener,
+ mojo::InterfaceRequest<mojo::CommandBuffer> request,
+ mojo::ViewportParameterListenerPtr listener,
scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
gpu::SyncPointManager* sync_point_manager,
scoped_ptr<CommandBufferDriver> driver)
@@ -75,9 +75,9 @@
}
void CommandBufferImpl::Initialize(
- CommandBufferSyncClientPtr sync_client,
- CommandBufferSyncPointClientPtr sync_point_client,
- ScopedSharedBufferHandle shared_state) {
+ mojo::CommandBufferSyncClientPtr sync_client,
+ mojo::CommandBufferSyncPointClientPtr sync_point_client,
+ mojo::ScopedSharedBufferHandle shared_state) {
sync_point_client_ = sync_point_client.Pass();
driver_task_runner_->PostTask(
FROM_HERE,
@@ -106,7 +106,7 @@
void CommandBufferImpl::RegisterTransferBuffer(
int32_t id,
- ScopedSharedBufferHandle transfer_buffer,
+ mojo::ScopedSharedBufferHandle transfer_buffer,
uint32_t size) {
driver_task_runner_->PostTask(
FROM_HERE, base::Bind(&CommandBufferDriver::RegisterTransferBuffer,
@@ -136,12 +136,13 @@
sync_point_manager_, sync_point));
}
-void CommandBufferImpl::Echo(const Callback<void()>& callback) {
+void CommandBufferImpl::Echo(const mojo::Callback<void()>& callback) {
driver_task_runner_->PostTaskAndReply(FROM_HERE, base::Bind(&base::DoNothing),
base::Bind(&RunCallback, callback));
}
-void CommandBufferImpl::BindToRequest(InterfaceRequest<CommandBuffer> request) {
+void CommandBufferImpl::BindToRequest(
+ mojo::InterfaceRequest<mojo::CommandBuffer> request) {
binding_.Bind(request.Pass());
}
@@ -157,4 +158,4 @@
timebase.ToInternalValue(), interval.ToInternalValue());
}
-} // namespace mojo
+} // namespace gles2
diff --git a/services/gles2/command_buffer_impl.h b/services/gles2/command_buffer_impl.h
index cb69fa2..def9f73 100644
--- a/services/gles2/command_buffer_impl.h
+++ b/services/gles2/command_buffer_impl.h
@@ -16,55 +16,55 @@
class SyncPointManager;
}
-namespace mojo {
+namespace gles2 {
class CommandBufferDriver;
// This class listens to the CommandBuffer message pipe on a low-latency thread
// so that we can insert sync points without blocking on the GL driver. It
// forwards most method calls to the CommandBufferDriver, which runs on the
// same thread as the native viewport.
-class CommandBufferImpl : public CommandBuffer {
+class CommandBufferImpl : public mojo::CommandBuffer {
public:
CommandBufferImpl(
- InterfaceRequest<CommandBuffer> request,
- ViewportParameterListenerPtr listener,
+ mojo::InterfaceRequest<CommandBuffer> request,
+ mojo::ViewportParameterListenerPtr listener,
scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
gpu::SyncPointManager* sync_point_manager,
scoped_ptr<CommandBufferDriver> driver);
~CommandBufferImpl() override;
- void Initialize(CommandBufferSyncClientPtr sync_client,
- CommandBufferSyncPointClientPtr sync_point_client,
- ScopedSharedBufferHandle shared_state) override;
+ void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
+ mojo::CommandBufferSyncPointClientPtr sync_point_client,
+ mojo::ScopedSharedBufferHandle shared_state) override;
void SetGetBuffer(int32_t buffer) override;
void Flush(int32_t put_offset) override;
void MakeProgress(int32_t last_get_offset) override;
void RegisterTransferBuffer(int32_t id,
- ScopedSharedBufferHandle transfer_buffer,
+ mojo::ScopedSharedBufferHandle transfer_buffer,
uint32_t size) override;
void DestroyTransferBuffer(int32_t id) override;
void InsertSyncPoint(bool retire) override;
void RetireSyncPoint(uint32_t sync_point) override;
- void Echo(const Callback<void()>& callback) override;
+ void Echo(const mojo::Callback<void()>& callback) override;
void LostContext(int32_t reason);
void UpdateVSyncParameters(base::TimeTicks timebase,
base::TimeDelta interval);
private:
- void BindToRequest(InterfaceRequest<CommandBuffer> request);
+ void BindToRequest(mojo::InterfaceRequest<CommandBuffer> request);
scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
scoped_refptr<base::SingleThreadTaskRunner> driver_task_runner_;
scoped_ptr<CommandBufferDriver> driver_;
- CommandBufferSyncPointClientPtr sync_point_client_;
- ViewportParameterListenerPtr viewport_parameter_listener_;
- StrongBinding<CommandBuffer> binding_;
+ mojo::CommandBufferSyncPointClientPtr sync_point_client_;
+ mojo::ViewportParameterListenerPtr viewport_parameter_listener_;
+ mojo::StrongBinding<CommandBuffer> binding_;
base::WeakPtrFactory<CommandBufferImpl> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl);
};
-} // namespace mojo
+} // namespace gles2
#endif // SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
diff --git a/services/gles2/command_buffer_type_conversions.cc b/services/gles2/command_buffer_type_conversions.cc
index 0e5843e..ad514e7 100644
--- a/services/gles2/command_buffer_type_conversions.cc
+++ b/services/gles2/command_buffer_type_conversions.cc
@@ -167,4 +167,4 @@
return result;
}
-} // namespace mojo
+} // namespace gles2
diff --git a/services/gles2/command_buffer_type_conversions.h b/services/gles2/command_buffer_type_conversions.h
index fc0b49b..913ff80 100644
--- a/services/gles2/command_buffer_type_conversions.h
+++ b/services/gles2/command_buffer_type_conversions.h
@@ -62,6 +62,6 @@
static gpu::Capabilities Convert(const GpuCapabilitiesPtr& input);
};
-} // namespace mojo
+} // namespace gles2
#endif // SERVICES_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
diff --git a/services/gles2/gpu_impl.cc b/services/gles2/gpu_impl.cc
index 6cbc48f..52d3191 100644
--- a/services/gles2/gpu_impl.cc
+++ b/services/gles2/gpu_impl.cc
@@ -13,7 +13,7 @@
#include "ui/gl/gl_share_group.h"
#include "ui/gl/gl_surface.h"
-namespace mojo {
+namespace gles2 {
GpuImpl::State::State()
: control_thread_("gpu_command_buffer_control"),
@@ -26,7 +26,7 @@
GpuImpl::State::~State() {
}
-GpuImpl::GpuImpl(InterfaceRequest<Gpu> request,
+GpuImpl::GpuImpl(mojo::InterfaceRequest<Gpu> request,
const scoped_refptr<State>& state)
: binding_(this, request.Pass()), state_(state) {
}
@@ -36,9 +36,9 @@
void GpuImpl::CreateOnscreenGLES2Context(
uint64_t native_viewport_id,
- SizePtr size,
- InterfaceRequest<CommandBuffer> request,
- ViewportParameterListenerPtr listener) {
+ mojo::SizePtr size,
+ mojo::InterfaceRequest<mojo::CommandBuffer> request,
+ mojo::ViewportParameterListenerPtr listener) {
gfx::AcceleratedWidget widget = bit_cast<gfx::AcceleratedWidget>(
static_cast<uintptr_t>(native_viewport_id));
new CommandBufferImpl(
@@ -50,8 +50,8 @@
}
void GpuImpl::CreateOffscreenGLES2Context(
- InterfaceRequest<CommandBuffer> request) {
- new CommandBufferImpl(request.Pass(), ViewportParameterListenerPtr(),
+ mojo::InterfaceRequest<mojo::CommandBuffer> request) {
+ new CommandBufferImpl(request.Pass(), mojo::ViewportParameterListenerPtr(),
state_->control_task_runner(),
state_->sync_point_manager(),
make_scoped_ptr(new CommandBufferDriver(
@@ -59,4 +59,4 @@
state_->sync_point_manager())));
}
-} // namespace mojo
+} // namespace gles2
diff --git a/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h
index 905c108..cf31a52 100644
--- a/services/gles2/gpu_impl.h
+++ b/services/gles2/gpu_impl.h
@@ -25,9 +25,9 @@
}
}
-namespace mojo {
+namespace gles2 {
-class GpuImpl : public Gpu {
+class GpuImpl : public mojo::Gpu {
public:
// We need to share these across all CommandBuffer instances so that contexts
// they create can share resources with each other via mailboxes.
@@ -62,25 +62,26 @@
scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
};
- GpuImpl(InterfaceRequest<Gpu> request, const scoped_refptr<State>& state);
+ GpuImpl(mojo::InterfaceRequest<mojo::Gpu> request,
+ const scoped_refptr<State>& state);
~GpuImpl() override;
void CreateOnscreenGLES2Context(
uint64_t native_viewport_id,
- SizePtr size,
- InterfaceRequest<CommandBuffer> command_buffer_request,
- ViewportParameterListenerPtr listener) override;
+ mojo::SizePtr size,
+ mojo::InterfaceRequest<mojo::CommandBuffer> command_buffer_request,
+ mojo::ViewportParameterListenerPtr listener) override;
- void CreateOffscreenGLES2Context(
- InterfaceRequest<CommandBuffer> command_buffer_request) override;
+ void CreateOffscreenGLES2Context(mojo::InterfaceRequest<mojo::CommandBuffer>
+ command_buffer_request) override;
private:
- StrongBinding<Gpu> binding_;
+ mojo::StrongBinding<Gpu> binding_;
scoped_refptr<State> state_;
DISALLOW_COPY_AND_ASSIGN(GpuImpl);
};
-} // namespace mojo
+} // namespace gles2
#endif // SERVICES_GLES2_GPU_IMPL_H_
diff --git a/services/gles2/mojo_buffer_backing.cc b/services/gles2/mojo_buffer_backing.cc
index bfe3a2d..1e20378 100644
--- a/services/gles2/mojo_buffer_backing.cc
+++ b/services/gles2/mojo_buffer_backing.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
-namespace mojo {
namespace gles2 {
MojoBufferBacking::MojoBufferBacking(mojo::ScopedSharedBufferHandle handle,
@@ -33,4 +32,3 @@
size_t MojoBufferBacking::GetSize() const { return size_; }
} // namespace gles2
-} // namespace mojo
diff --git a/services/gles2/mojo_buffer_backing.h b/services/gles2/mojo_buffer_backing.h
index bc108b5..b0e3ede 100644
--- a/services/gles2/mojo_buffer_backing.h
+++ b/services/gles2/mojo_buffer_backing.h
@@ -10,7 +10,6 @@
#include "gpu/command_buffer/common/buffer.h"
#include "mojo/public/cpp/system/core.h"
-namespace mojo {
namespace gles2 {
class MojoBufferBacking : public gpu::BufferBacking {
@@ -36,6 +35,5 @@
};
} // namespace gles2
-} // namespace mojo
#endif // SERVICES_GLES2_MOJO_BUFFER_BACKING_H_
