Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: mojo/examples/sample_app/gles2_client_impl.cc

Issue 393093003: Mojo: Move sample_app out from namespace mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Landing Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/examples/sample_app/gles2_client_impl.h ('k') | mojo/examples/sample_app/sample_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/sample_app/gles2_client_impl.cc
diff --git a/mojo/examples/sample_app/gles2_client_impl.cc b/mojo/examples/sample_app/gles2_client_impl.cc
index eb571b49a77fb1ac7717eb7e7114cea963daa14e..0cb76e10e4c24ce3c3cec0f130adaa6a9e3910af 100644
--- a/mojo/examples/sample_app/gles2_client_impl.cc
+++ b/mojo/examples/sample_app/gles2_client_impl.cc
@@ -12,11 +12,10 @@
#include "mojo/public/c/gles2/gles2.h"
#include "ui/events/event_constants.h"
-namespace mojo {
namespace examples {
namespace {
-float CalculateDragDistance(const gfx::PointF& start, const Point& end) {
+float CalculateDragDistance(const gfx::PointF& start, const mojo::Point& end) {
return hypot(start.x() - end.x, start.y() - end.y);
}
@@ -26,7 +25,7 @@ float GetRandomColor() {
}
-GLES2ClientImpl::GLES2ClientImpl(CommandBufferPtr command_buffer)
+GLES2ClientImpl::GLES2ClientImpl(mojo::CommandBufferPtr command_buffer)
: getting_animation_frames_(false) {
context_ = MojoGLES2CreateContext(
command_buffer.PassMessagePipe().release().value(),
@@ -40,7 +39,7 @@ GLES2ClientImpl::~GLES2ClientImpl() {
MojoGLES2DestroyContext(context_);
}
-void GLES2ClientImpl::SetSize(const Size& size) {
+void GLES2ClientImpl::SetSize(const mojo::Size& size) {
size_ = gfx::Size(size.width, size.height);
if (size_.IsEmpty())
return;
@@ -48,7 +47,7 @@ void GLES2ClientImpl::SetSize(const Size& size) {
RequestAnimationFrames();
}
-void GLES2ClientImpl::HandleInputEvent(const Event& event) {
+void GLES2ClientImpl::HandleInputEvent(const mojo::Event& event) {
switch (event.action) {
case ui::ET_MOUSE_PRESSED:
case ui::ET_TOUCH_PRESSED:
@@ -57,7 +56,7 @@ void GLES2ClientImpl::HandleInputEvent(const Event& event) {
CancelAnimationFrames();
capture_point_.SetPoint(event.location->x, event.location->y);
last_drag_point_ = capture_point_;
- drag_start_time_ = GetTimeTicksNow();
+ drag_start_time_ = mojo::GetTimeTicksNow();
break;
case ui::ET_MOUSE_DRAGGED:
case ui::ET_TOUCH_MOVED:
@@ -81,7 +80,7 @@ void GLES2ClientImpl::HandleInputEvent(const Event& event) {
cube_.set_color(GetRandomColor(), GetRandomColor(), GetRandomColor());
break;
}
- MojoTimeTicks offset = GetTimeTicksNow() - drag_start_time_;
+ MojoTimeTicks offset = mojo::GetTimeTicksNow() - drag_start_time_;
float delta = static_cast<float>(offset) / 1000000.;
cube_.SetFlingMultiplier(
CalculateDragDistance(capture_point_, *event.location),
@@ -105,7 +104,7 @@ void GLES2ClientImpl::ContextLostThunk(void* closure) {
}
void GLES2ClientImpl::DrawAnimationFrame() {
- MojoTimeTicks now = GetTimeTicksNow();
+ MojoTimeTicks now = mojo::GetTimeTicksNow();
MojoTimeTicks offset = now - last_time_;
float delta = static_cast<float>(offset) / 1000000.;
last_time_ = now;
@@ -122,7 +121,7 @@ void GLES2ClientImpl::DrawAnimationFrameThunk(void* closure) {
void GLES2ClientImpl::RequestAnimationFrames() {
getting_animation_frames_ = true;
MojoGLES2RequestAnimationFrames(context_);
- last_time_ = GetTimeTicksNow();
+ last_time_ = mojo::GetTimeTicksNow();
}
void GLES2ClientImpl::CancelAnimationFrames() {
@@ -131,4 +130,3 @@ void GLES2ClientImpl::CancelAnimationFrames() {
}
} // namespace examples
-} // namespace mojo
« no previous file with comments | « mojo/examples/sample_app/gles2_client_impl.h ('k') | mojo/examples/sample_app/sample_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698