Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ | 5 #ifndef MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ |
| 6 #define MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ | 6 #define MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
| 10 #include "mojo/examples/sample_app/spinning_cube.h" | 10 #include "mojo/examples/sample_app/spinning_cube.h" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 private: | 26 private: |
| 27 virtual void DidCreateContext(uint64_t encoded, | 27 virtual void DidCreateContext(uint64_t encoded, |
| 28 uint32_t width, | 28 uint32_t width, |
| 29 uint32_t height) MOJO_OVERRIDE; | 29 uint32_t height) MOJO_OVERRIDE; |
| 30 virtual void ContextLost() MOJO_OVERRIDE; | 30 virtual void ContextLost() MOJO_OVERRIDE; |
| 31 | 31 |
| 32 void Draw(); | 32 void Draw(); |
| 33 void StartTimer(); | 33 void StartTimer(); |
| 34 | 34 |
| 35 base::Time last_time_; | 35 base::Time last_time_; |
| 36 base::RepeatingTimer<GLES2ClientImpl> timer_; | 36 base::OneShotTimer<GLES2ClientImpl> timer_; |
|
abarth-chromium
2014/01/07 23:01:04
Is this change intentional?
Aaron Boodman
2014/01/07 23:22:38
Heh, no. Thanks.
| |
| 37 SpinningCube cube_; | 37 SpinningCube cube_; |
| 38 gfx::PointF capture_point_; | 38 gfx::PointF capture_point_; |
| 39 gfx::PointF last_drag_point_; | 39 gfx::PointF last_drag_point_; |
| 40 base::Time drag_start_time_; | 40 base::Time drag_start_time_; |
| 41 | 41 |
| 42 RemotePtr<GLES2> service_; | 42 RemotePtr<GLES2> service_; |
| 43 | 43 |
| 44 MOJO_DISALLOW_COPY_AND_ASSIGN(GLES2ClientImpl); | 44 MOJO_DISALLOW_COPY_AND_ASSIGN(GLES2ClientImpl); |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } // namespace examples | 47 } // namespace examples |
| 48 } // namespace mojo | 48 } // namespace mojo |
| 49 | 49 |
| 50 #endif // MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ | 50 #endif // MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_ |
| OLD | NEW |