| Index: mojo/examples/pepper_container_app/graphics_3d_resource.h
|
| diff --git a/mojo/examples/pepper_container_app/graphics_3d_resource.h b/mojo/examples/pepper_container_app/graphics_3d_resource.h
|
| index 35a57a30dde8c133ec0f74a1a6ec5934bfad7d14..b6ad3b5b0f914cfc393fc6cf29ff4bbac402f51d 100644
|
| --- a/mojo/examples/pepper_container_app/graphics_3d_resource.h
|
| +++ b/mojo/examples/pepper_container_app/graphics_3d_resource.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef MOJO_EXAMPLES_PEPPER_CONTAINER_APP_GRAPHICS_3D_RESOURCE_H_
|
| #define MOJO_EXAMPLES_PEPPER_CONTAINER_APP_GRAPHICS_3D_RESOURCE_H_
|
|
|
| -#include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "mojo/public/c/gles2/gles2_types.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| @@ -24,25 +23,25 @@ class Graphics3DResource : public ppapi::Resource,
|
| void BindGraphics();
|
|
|
| // ppapi::Resource overrides.
|
| - virtual ppapi::thunk::PPB_Graphics3D_API* AsPPB_Graphics3D_API() OVERRIDE;
|
| + virtual ppapi::thunk::PPB_Graphics3D_API* AsPPB_Graphics3D_API() override;
|
|
|
| // ppapi::thunk::PPB_Graphics3D_API implementation.
|
| - virtual int32_t GetAttribs(int32_t attrib_list[]) OVERRIDE;
|
| - virtual int32_t SetAttribs(const int32_t attrib_list[]) OVERRIDE;
|
| - virtual int32_t GetError() OVERRIDE;
|
| - virtual int32_t ResizeBuffers(int32_t width, int32_t height) OVERRIDE;
|
| + virtual int32_t GetAttribs(int32_t attrib_list[]) override;
|
| + virtual int32_t SetAttribs(const int32_t attrib_list[]) override;
|
| + virtual int32_t GetError() override;
|
| + virtual int32_t ResizeBuffers(int32_t width, int32_t height) override;
|
| virtual int32_t SwapBuffers(
|
| - scoped_refptr<ppapi::TrackedCallback> callback) OVERRIDE;
|
| - virtual int32_t GetAttribMaxValue(int32_t attribute, int32_t* value) OVERRIDE;
|
| - virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE;
|
| + scoped_refptr<ppapi::TrackedCallback> callback) override;
|
| + virtual int32_t GetAttribMaxValue(int32_t attribute, int32_t* value) override;
|
| + virtual PP_Bool SetGetBuffer(int32_t shm_id) override;
|
| virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
|
| - int32* id) OVERRIDE;
|
| - virtual PP_Bool DestroyTransferBuffer(int32_t id) OVERRIDE;
|
| - virtual PP_Bool Flush(int32_t put_offset) OVERRIDE;
|
| + int32* id) override;
|
| + virtual PP_Bool DestroyTransferBuffer(int32_t id) override;
|
| + virtual PP_Bool Flush(int32_t put_offset) override;
|
| virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start,
|
| - int32_t end) OVERRIDE;
|
| + int32_t end) override;
|
| virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(
|
| - int32_t start, int32_t end) OVERRIDE;
|
| + int32_t start, int32_t end) override;
|
| virtual void* MapTexSubImage2DCHROMIUM(GLenum target,
|
| GLint level,
|
| GLint xoffset,
|
| @@ -51,11 +50,11 @@ class Graphics3DResource : public ppapi::Resource,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - GLenum access) OVERRIDE;
|
| - virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) OVERRIDE;
|
| - virtual uint32_t InsertSyncPoint() OVERRIDE;
|
| - virtual uint32_t InsertFutureSyncPoint() OVERRIDE;
|
| - virtual void RetireSyncPoint(uint32_t sync_point) OVERRIDE;
|
| + GLenum access) override;
|
| + virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) override;
|
| + virtual uint32_t InsertSyncPoint() override;
|
| + virtual uint32_t InsertFutureSyncPoint() override;
|
| + virtual void RetireSyncPoint(uint32_t sync_point) override;
|
|
|
| private:
|
| virtual ~Graphics3DResource();
|
|
|