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

Side by Side Diff: mojo/gles2/gles2_context.h

Issue 619493002: Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/. (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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_GLES2_GLES2_CONTEXT_H_ 5 #ifndef MOJO_GLES2_GLES2_CONTEXT_H_
6 #define MOJO_GLES2_GLES2_CONTEXT_H_ 6 #define MOJO_GLES2_GLES2_CONTEXT_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "gpu/command_buffer/client/gles2_implementation.h" 10 #include "gpu/command_buffer/client/gles2_implementation.h"
(...skipping 22 matching lines...) Expand all
33 void* closure); 33 void* closure);
34 virtual ~GLES2Context(); 34 virtual ~GLES2Context();
35 bool Initialize(); 35 bool Initialize();
36 36
37 gpu::gles2::GLES2Interface* interface() const { 37 gpu::gles2::GLES2Interface* interface() const {
38 return implementation_.get(); 38 return implementation_.get();
39 } 39 }
40 gpu::ContextSupport* context_support() const { return implementation_.get(); } 40 gpu::ContextSupport* context_support() const { return implementation_.get(); }
41 41
42 private: 42 private:
43 virtual void ContextLost() OVERRIDE; 43 virtual void ContextLost() override;
44 44
45 CommandBufferClientImpl command_buffer_; 45 CommandBufferClientImpl command_buffer_;
46 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_; 46 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
47 scoped_ptr<gpu::TransferBuffer> transfer_buffer_; 47 scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
48 scoped_ptr<gpu::gles2::GLES2Implementation> implementation_; 48 scoped_ptr<gpu::gles2::GLES2Implementation> implementation_;
49 MojoGLES2ContextLost lost_callback_; 49 MojoGLES2ContextLost lost_callback_;
50 void* closure_; 50 void* closure_;
51 51
52 MOJO_DISALLOW_COPY_AND_ASSIGN(GLES2Context); 52 MOJO_DISALLOW_COPY_AND_ASSIGN(GLES2Context);
53 }; 53 };
54 54
55 } // namespace gles2 55 } // namespace gles2
56 } // namespace mojo 56 } // namespace mojo
57 57
58 #endif // MOJO_GLES2_GLES2_CONTEXT_H_ 58 #endif // MOJO_GLES2_GLES2_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698