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

Side by Side Diff: gpu/command_buffer/client/gl_in_process_context.cc

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE 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 #include "gpu/command_buffer/client/gl_in_process_context.h" 5 #include "gpu/command_buffer/client/gl_in_process_context.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 bool is_offscreen, 55 bool is_offscreen,
56 bool use_global_share_group, 56 bool use_global_share_group,
57 GLInProcessContext* share_context, 57 GLInProcessContext* share_context,
58 gfx::AcceleratedWidget window, 58 gfx::AcceleratedWidget window,
59 const gfx::Size& size, 59 const gfx::Size& size,
60 const gpu::gles2::ContextCreationAttribHelper& attribs, 60 const gpu::gles2::ContextCreationAttribHelper& attribs,
61 gfx::GpuPreference gpu_preference, 61 gfx::GpuPreference gpu_preference,
62 const scoped_refptr<InProcessCommandBuffer::Service>& service); 62 const scoped_refptr<InProcessCommandBuffer::Service>& service);
63 63
64 // GLInProcessContext implementation: 64 // GLInProcessContext implementation:
65 virtual void SetContextLostCallback(const base::Closure& callback) OVERRIDE; 65 virtual void SetContextLostCallback(const base::Closure& callback) override;
66 virtual gles2::GLES2Implementation* GetImplementation() OVERRIDE; 66 virtual gles2::GLES2Implementation* GetImplementation() override;
67 virtual size_t GetMappedMemoryLimit() OVERRIDE; 67 virtual size_t GetMappedMemoryLimit() override;
68 68
69 #if defined(OS_ANDROID) 69 #if defined(OS_ANDROID)
70 virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( 70 virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
71 uint32 stream_id) OVERRIDE; 71 uint32 stream_id) override;
72 #endif 72 #endif
73 73
74 private: 74 private:
75 void Destroy(); 75 void Destroy();
76 void OnContextLost(); 76 void OnContextLost();
77 void OnSignalSyncPoint(const base::Closure& callback); 77 void OnSignalSyncPoint(const base::Closure& callback);
78 78
79 scoped_ptr<gles2::GLES2CmdHelper> gles2_helper_; 79 scoped_ptr<gles2::GLES2CmdHelper> gles2_helper_;
80 scoped_ptr<TransferBuffer> transfer_buffer_; 80 scoped_ptr<TransferBuffer> transfer_buffer_;
81 scoped_ptr<gles2::GLES2Implementation> gles2_implementation_; 81 scoped_ptr<gles2::GLES2Implementation> gles2_implementation_;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 size, 289 size,
290 attribs, 290 attribs,
291 gpu_preference, 291 gpu_preference,
292 service)) 292 service))
293 return NULL; 293 return NULL;
294 294
295 return context.release(); 295 return context.release();
296 } 296 }
297 297
298 } // namespace gpu 298 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/cmd_buffer_helper_test.cc ('k') | gpu/command_buffer/client/gles2_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698