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

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

Powered by Google App Engine
This is Rietveld 408576698