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

Side by Side Diff: ui/gl/gl_surface_osmesa.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/gl/gl_surface_mac.cc ('k') | ui/gl/gl_surface_ozone.cc » ('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 UI_GL_GL_SURFACE_OSMESA_H_ 5 #ifndef UI_GL_GL_SURFACE_OSMESA_H_
6 #define UI_GL_GL_SURFACE_OSMESA_H_ 6 #define UI_GL_GL_SURFACE_OSMESA_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/gfx/size.h" 9 #include "ui/gfx/size.h"
10 #include "ui/gl/gl_surface.h" 10 #include "ui/gl/gl_surface.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 enum OSMesaSurfaceFormat { OSMesaSurfaceFormatBGRA, OSMesaSurfaceFormatRGBA }; 14 enum OSMesaSurfaceFormat { OSMesaSurfaceFormatBGRA, OSMesaSurfaceFormatRGBA };
15 15
16 // A surface that the Mesa software renderer draws to. This is actually just a 16 // A surface that the Mesa software renderer draws to. This is actually just a
17 // buffer in system memory. GetHandle returns a pointer to the buffer. These 17 // buffer in system memory. GetHandle returns a pointer to the buffer. These
18 // surfaces can be resized and resizing preserves the contents. 18 // surfaces can be resized and resizing preserves the contents.
19 class GL_EXPORT GLSurfaceOSMesa : public GLSurface { 19 class GL_EXPORT GLSurfaceOSMesa : public GLSurface {
20 public: 20 public:
21 GLSurfaceOSMesa(OSMesaSurfaceFormat format, const gfx::Size& size); 21 GLSurfaceOSMesa(OSMesaSurfaceFormat format, const gfx::Size& size);
22 22
23 // Implement GLSurface. 23 // Implement GLSurface.
24 virtual bool Initialize() OVERRIDE; 24 virtual bool Initialize() override;
25 virtual void Destroy() OVERRIDE; 25 virtual void Destroy() override;
26 virtual bool Resize(const gfx::Size& new_size) OVERRIDE; 26 virtual bool Resize(const gfx::Size& new_size) override;
27 virtual bool IsOffscreen() OVERRIDE; 27 virtual bool IsOffscreen() override;
28 virtual bool SwapBuffers() OVERRIDE; 28 virtual bool SwapBuffers() override;
29 virtual gfx::Size GetSize() OVERRIDE; 29 virtual gfx::Size GetSize() override;
30 virtual void* GetHandle() OVERRIDE; 30 virtual void* GetHandle() override;
31 virtual unsigned GetFormat() OVERRIDE; 31 virtual unsigned GetFormat() override;
32 32
33 protected: 33 protected:
34 virtual ~GLSurfaceOSMesa(); 34 virtual ~GLSurfaceOSMesa();
35 35
36 private: 36 private:
37 unsigned format_; 37 unsigned format_;
38 gfx::Size size_; 38 gfx::Size size_;
39 scoped_ptr<int32[]> buffer_; 39 scoped_ptr<int32[]> buffer_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesa); 41 DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesa);
42 }; 42 };
43 43
44 // A thin subclass of |GLSurfaceOSMesa| that can be used in place 44 // A thin subclass of |GLSurfaceOSMesa| that can be used in place
45 // of a native hardware-provided surface when a native surface 45 // of a native hardware-provided surface when a native surface
46 // provider is not available. 46 // provider is not available.
47 class GLSurfaceOSMesaHeadless : public GLSurfaceOSMesa { 47 class GLSurfaceOSMesaHeadless : public GLSurfaceOSMesa {
48 public: 48 public:
49 explicit GLSurfaceOSMesaHeadless(); 49 explicit GLSurfaceOSMesaHeadless();
50 50
51 virtual bool IsOffscreen() OVERRIDE; 51 virtual bool IsOffscreen() override;
52 virtual bool SwapBuffers() OVERRIDE; 52 virtual bool SwapBuffers() override;
53 53
54 protected: 54 protected:
55 virtual ~GLSurfaceOSMesaHeadless(); 55 virtual ~GLSurfaceOSMesaHeadless();
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesaHeadless); 58 DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesaHeadless);
59 }; 59 };
60 60
61 } // namespace gfx 61 } // namespace gfx
62 62
63 #endif // UI_GL_GL_SURFACE_OSMESA_H_ 63 #endif // UI_GL_GL_SURFACE_OSMESA_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_mac.cc ('k') | ui/gl/gl_surface_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698