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

Side by Side Diff: ppapi/proxy/ppb_graphics_3d_proxy.h

Issue 631733002: Replacing the OVERRIDE with override and FINAL with final in ppapi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ 5 #ifndef PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
6 #define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ 6 #define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 18 matching lines...) Expand all
29 29
30 class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { 30 class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared {
31 public: 31 public:
32 explicit Graphics3D(const HostResource& resource); 32 explicit Graphics3D(const HostResource& resource);
33 virtual ~Graphics3D(); 33 virtual ~Graphics3D();
34 34
35 bool Init(gpu::gles2::GLES2Implementation* share_gles2, 35 bool Init(gpu::gles2::GLES2Implementation* share_gles2,
36 const SerializedHandle& shared_state); 36 const SerializedHandle& shared_state);
37 37
38 // Graphics3DTrusted API. These are not implemented in the proxy. 38 // Graphics3DTrusted API. These are not implemented in the proxy.
39 virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE; 39 virtual PP_Bool SetGetBuffer(int32_t shm_id) override;
40 virtual PP_Bool Flush(int32_t put_offset) OVERRIDE; 40 virtual PP_Bool Flush(int32_t put_offset) override;
41 virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, 41 virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
42 int32* id) OVERRIDE; 42 int32* id) override;
43 virtual PP_Bool DestroyTransferBuffer(int32_t id) OVERRIDE; 43 virtual PP_Bool DestroyTransferBuffer(int32_t id) override;
44 virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, 44 virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start,
45 int32_t end) OVERRIDE; 45 int32_t end) override;
46 virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, 46 virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start,
47 int32_t end) 47 int32_t end)
48 OVERRIDE; 48 override;
49 virtual uint32_t InsertSyncPoint() OVERRIDE; 49 virtual uint32_t InsertSyncPoint() override;
50 virtual uint32_t InsertFutureSyncPoint() OVERRIDE; 50 virtual uint32_t InsertFutureSyncPoint() override;
51 virtual void RetireSyncPoint(uint32_t sync_point) OVERRIDE; 51 virtual void RetireSyncPoint(uint32_t sync_point) override;
52 52
53 private: 53 private:
54 // PPB_Graphics3D_Shared overrides. 54 // PPB_Graphics3D_Shared overrides.
55 virtual gpu::CommandBuffer* GetCommandBuffer() OVERRIDE; 55 virtual gpu::CommandBuffer* GetCommandBuffer() override;
56 virtual gpu::GpuControl* GetGpuControl() OVERRIDE; 56 virtual gpu::GpuControl* GetGpuControl() override;
57 virtual int32 DoSwapBuffers() OVERRIDE; 57 virtual int32 DoSwapBuffers() override;
58 58
59 scoped_ptr<PpapiCommandBufferProxy> command_buffer_; 59 scoped_ptr<PpapiCommandBufferProxy> command_buffer_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(Graphics3D); 61 DISALLOW_COPY_AND_ASSIGN(Graphics3D);
62 }; 62 };
63 63
64 class PPB_Graphics3D_Proxy : public InterfaceProxy { 64 class PPB_Graphics3D_Proxy : public InterfaceProxy {
65 public: 65 public:
66 PPB_Graphics3D_Proxy(Dispatcher* dispatcher); 66 PPB_Graphics3D_Proxy(Dispatcher* dispatcher);
67 virtual ~PPB_Graphics3D_Proxy(); 67 virtual ~PPB_Graphics3D_Proxy();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ProxyCompletionCallbackFactory<PPB_Graphics3D_Proxy> callback_factory_; 117 ProxyCompletionCallbackFactory<PPB_Graphics3D_Proxy> callback_factory_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Proxy); 119 DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Proxy);
120 }; 120 };
121 121
122 } // namespace proxy 122 } // namespace proxy
123 } // namespace ppapi 123 } // namespace ppapi
124 124
125 #endif // PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ 125 #endif // PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_
126 126
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698