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

Side by Side Diff: ui/gl/gl_image_egl.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_gl_api_implementation.h ('k') | ui/gl/gl_image_glx.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_EGL_H_ 5 #ifndef UI_GL_GL_IMAGE_EGL_H_
6 #define UI_GL_GL_IMAGE_EGL_H_ 6 #define UI_GL_GL_IMAGE_EGL_H_
7 7
8 #include "ui/gl/gl_bindings.h" 8 #include "ui/gl/gl_bindings.h"
9 #include "ui/gl/gl_image.h" 9 #include "ui/gl/gl_image.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 12
13 class GL_EXPORT GLImageEGL : public GLImage { 13 class GL_EXPORT GLImageEGL : public GLImage {
14 public: 14 public:
15 explicit GLImageEGL(const gfx::Size& size); 15 explicit GLImageEGL(const gfx::Size& size);
16 16
17 bool Initialize(EGLenum target, EGLClientBuffer buffer, const EGLint* attrs); 17 bool Initialize(EGLenum target, EGLClientBuffer buffer, const EGLint* attrs);
18 18
19 // Overridden from GLImage: 19 // Overridden from GLImage:
20 virtual void Destroy(bool have_context) OVERRIDE; 20 virtual void Destroy(bool have_context) override;
21 virtual gfx::Size GetSize() OVERRIDE; 21 virtual gfx::Size GetSize() override;
22 virtual bool BindTexImage(unsigned target) OVERRIDE; 22 virtual bool BindTexImage(unsigned target) override;
23 virtual void ReleaseTexImage(unsigned target) OVERRIDE {} 23 virtual void ReleaseTexImage(unsigned target) override {}
24 virtual bool CopyTexImage(unsigned target) OVERRIDE; 24 virtual bool CopyTexImage(unsigned target) override;
25 virtual void WillUseTexImage() OVERRIDE {} 25 virtual void WillUseTexImage() override {}
26 virtual void DidUseTexImage() OVERRIDE {} 26 virtual void DidUseTexImage() override {}
27 virtual void WillModifyTexImage() OVERRIDE {} 27 virtual void WillModifyTexImage() override {}
28 virtual void DidModifyTexImage() OVERRIDE {} 28 virtual void DidModifyTexImage() override {}
29 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 29 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
30 int z_order, 30 int z_order,
31 OverlayTransform transform, 31 OverlayTransform transform,
32 const Rect& bounds_rect, 32 const Rect& bounds_rect,
33 const RectF& crop_rect) OVERRIDE; 33 const RectF& crop_rect) override;
34 34
35 protected: 35 protected:
36 virtual ~GLImageEGL(); 36 virtual ~GLImageEGL();
37 37
38 EGLImageKHR egl_image_; 38 EGLImageKHR egl_image_;
39 const gfx::Size size_; 39 const gfx::Size size_;
40 40
41 private: 41 private:
42 DISALLOW_COPY_AND_ASSIGN(GLImageEGL); 42 DISALLOW_COPY_AND_ASSIGN(GLImageEGL);
43 }; 43 };
44 44
45 } // namespace gfx 45 } // namespace gfx
46 46
47 #endif // UI_GL_GL_IMAGE_EGL_H_ 47 #endif // UI_GL_GL_IMAGE_EGL_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_gl_api_implementation.h ('k') | ui/gl/gl_image_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698