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

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

Issue 630883002: replace OVERRIDE and FINAL with override and 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
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.h ('k') | ppapi/proxy/ppapi_proxy_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_COMMAND_BUFFER_PROXY_H_ 5 #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 26
27 class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, 27 class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer,
28 public gpu::GpuControl { 28 public gpu::GpuControl {
29 public: 29 public:
30 PpapiCommandBufferProxy(const HostResource& resource, 30 PpapiCommandBufferProxy(const HostResource& resource,
31 ProxyChannel* channel, 31 ProxyChannel* channel,
32 const SerializedHandle& shared_state); 32 const SerializedHandle& shared_state);
33 virtual ~PpapiCommandBufferProxy(); 33 virtual ~PpapiCommandBufferProxy();
34 34
35 // gpu::CommandBuffer implementation: 35 // gpu::CommandBuffer implementation:
36 virtual bool Initialize() OVERRIDE; 36 virtual bool Initialize() override;
37 virtual State GetLastState() OVERRIDE; 37 virtual State GetLastState() override;
38 virtual int32 GetLastToken() OVERRIDE; 38 virtual int32 GetLastToken() override;
39 virtual void Flush(int32 put_offset) OVERRIDE; 39 virtual void Flush(int32 put_offset) override;
40 virtual void WaitForTokenInRange(int32 start, int32 end) OVERRIDE; 40 virtual void WaitForTokenInRange(int32 start, int32 end) override;
41 virtual void WaitForGetOffsetInRange(int32 start, int32 end) OVERRIDE; 41 virtual void WaitForGetOffsetInRange(int32 start, int32 end) override;
42 virtual void SetGetBuffer(int32 transfer_buffer_id) OVERRIDE; 42 virtual void SetGetBuffer(int32 transfer_buffer_id) override;
43 virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size, 43 virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
44 int32* id) OVERRIDE; 44 int32* id) override;
45 virtual void DestroyTransferBuffer(int32 id) OVERRIDE; 45 virtual void DestroyTransferBuffer(int32 id) override;
46 46
47 // gpu::GpuControl implementation: 47 // gpu::GpuControl implementation:
48 virtual gpu::Capabilities GetCapabilities() OVERRIDE; 48 virtual gpu::Capabilities GetCapabilities() override;
49 virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(size_t width, 49 virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(size_t width,
50 size_t height, 50 size_t height,
51 unsigned internalformat, 51 unsigned internalformat,
52 unsigned usage, 52 unsigned usage,
53 int32* id) OVERRIDE; 53 int32* id) override;
54 virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE; 54 virtual void DestroyGpuMemoryBuffer(int32 id) override;
55 virtual uint32 InsertSyncPoint() OVERRIDE; 55 virtual uint32 InsertSyncPoint() override;
56 virtual uint32 InsertFutureSyncPoint() OVERRIDE; 56 virtual uint32 InsertFutureSyncPoint() override;
57 virtual void RetireSyncPoint(uint32 sync_point) OVERRIDE; 57 virtual void RetireSyncPoint(uint32 sync_point) override;
58 virtual void SignalSyncPoint(uint32 sync_point, 58 virtual void SignalSyncPoint(uint32 sync_point,
59 const base::Closure& callback) OVERRIDE; 59 const base::Closure& callback) override;
60 virtual void SignalQuery(uint32 query, 60 virtual void SignalQuery(uint32 query,
61 const base::Closure& callback) OVERRIDE; 61 const base::Closure& callback) override;
62 virtual void SetSurfaceVisible(bool visible) OVERRIDE; 62 virtual void SetSurfaceVisible(bool visible) override;
63 virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE; 63 virtual uint32 CreateStreamTexture(uint32 texture_id) override;
64 64
65 private: 65 private:
66 bool Send(IPC::Message* msg); 66 bool Send(IPC::Message* msg);
67 void UpdateState(const gpu::CommandBuffer::State& state, bool success); 67 void UpdateState(const gpu::CommandBuffer::State& state, bool success);
68 68
69 // Try to read an updated copy of the state from shared memory. 69 // Try to read an updated copy of the state from shared memory.
70 void TryUpdateState(); 70 void TryUpdateState();
71 71
72 // The shared memory area used to update state. 72 // The shared memory area used to update state.
73 gpu::CommandBufferSharedState* shared_state() const; 73 gpu::CommandBufferSharedState* shared_state() const;
74 74
75 State last_state_; 75 State last_state_;
76 scoped_ptr<base::SharedMemory> shared_state_shm_; 76 scoped_ptr<base::SharedMemory> shared_state_shm_;
77 77
78 HostResource resource_; 78 HostResource resource_;
79 ProxyChannel* channel_; 79 ProxyChannel* channel_;
80 80
81 base::Closure channel_error_callback_; 81 base::Closure channel_error_callback_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy); 83 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy);
84 }; 84 };
85 85
86 } // namespace proxy 86 } // namespace proxy
87 } // namespace ppapi 87 } // namespace ppapi
88 88
89 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 89 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.h ('k') | ppapi/proxy/ppapi_proxy_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698