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

Side by Side Diff: ui/gl/gl_image_glx.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_image_egl.h ('k') | ui/gl/gl_image_io_surface.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 UI_GL_GL_IMAGE_GLX_H_ 5 #ifndef UI_GL_GL_IMAGE_GLX_H_
6 #define UI_GL_GL_IMAGE_GLX_H_ 6 #define UI_GL_GL_IMAGE_GLX_H_
7 7
8 #include "ui/gfx/size.h" 8 #include "ui/gfx/size.h"
9 #include "ui/gfx/x/x11_types.h" 9 #include "ui/gfx/x/x11_types.h"
10 #include "ui/gl/gl_export.h" 10 #include "ui/gl/gl_export.h"
11 #include "ui/gl/gl_image.h" 11 #include "ui/gl/gl_image.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 class GL_EXPORT GLImageGLX : public GLImage { 15 class GL_EXPORT GLImageGLX : public GLImage {
16 public: 16 public:
17 GLImageGLX(const gfx::Size& size, unsigned internalformat); 17 GLImageGLX(const gfx::Size& size, unsigned internalformat);
18 18
19 bool Initialize(XID pixmap); 19 bool Initialize(XID pixmap);
20 20
21 // Overridden from GLImage: 21 // Overridden from GLImage:
22 virtual void Destroy(bool have_context) OVERRIDE; 22 virtual void Destroy(bool have_context) override;
23 virtual gfx::Size GetSize() OVERRIDE; 23 virtual gfx::Size GetSize() override;
24 virtual bool BindTexImage(unsigned target) OVERRIDE; 24 virtual bool BindTexImage(unsigned target) override;
25 virtual void ReleaseTexImage(unsigned target) OVERRIDE; 25 virtual void ReleaseTexImage(unsigned target) override;
26 virtual bool CopyTexImage(unsigned target) OVERRIDE; 26 virtual bool CopyTexImage(unsigned target) override;
27 virtual void WillUseTexImage() OVERRIDE {} 27 virtual void WillUseTexImage() override {}
28 virtual void DidUseTexImage() OVERRIDE {} 28 virtual void DidUseTexImage() override {}
29 virtual void WillModifyTexImage() OVERRIDE {} 29 virtual void WillModifyTexImage() override {}
30 virtual void DidModifyTexImage() OVERRIDE {} 30 virtual void DidModifyTexImage() override {}
31 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 31 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
32 int z_order, 32 int z_order,
33 OverlayTransform transform, 33 OverlayTransform transform,
34 const Rect& bounds_rect, 34 const Rect& bounds_rect,
35 const RectF& crop_rect) OVERRIDE; 35 const RectF& crop_rect) override;
36 36
37 protected: 37 protected:
38 virtual ~GLImageGLX(); 38 virtual ~GLImageGLX();
39 39
40 private: 40 private:
41 XID glx_pixmap_; 41 XID glx_pixmap_;
42 const gfx::Size size_; 42 const gfx::Size size_;
43 unsigned internalformat_; 43 unsigned internalformat_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); 45 DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
46 }; 46 };
47 47
48 } // namespace gfx 48 } // namespace gfx
49 49
50 #endif // UI_GL_GL_IMAGE_GLX_H_ 50 #endif // UI_GL_GL_IMAGE_GLX_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_image_egl.h ('k') | ui/gl/gl_image_io_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698