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

Side by Side Diff: ui/gl/gl_image_surface_texture.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_stub.h ('k') | ui/gl/gl_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 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 UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_ 5 #ifndef UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
6 #define UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_ 6 #define UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "ui/gfx/gpu_memory_buffer.h" 9 #include "ui/gfx/gpu_memory_buffer.h"
10 #include "ui/gl/gl_bindings.h" 10 #include "ui/gl/gl_bindings.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 SurfaceTexture; 15 class SurfaceTexture;
16 16
17 class GL_EXPORT GLImageSurfaceTexture : public GLImage { 17 class GL_EXPORT GLImageSurfaceTexture : public GLImage {
18 public: 18 public:
19 explicit GLImageSurfaceTexture(const gfx::Size& size); 19 explicit GLImageSurfaceTexture(const gfx::Size& size);
20 20
21 bool Initialize(const gfx::GpuMemoryBufferHandle& handle); 21 bool Initialize(const gfx::GpuMemoryBufferHandle& handle);
22 22
23 // Overridden from GLImage: 23 // Overridden from GLImage:
24 virtual void Destroy(bool have_context) OVERRIDE; 24 virtual void Destroy(bool have_context) override;
25 virtual gfx::Size GetSize() OVERRIDE; 25 virtual gfx::Size GetSize() override;
26 virtual bool BindTexImage(unsigned target) OVERRIDE; 26 virtual bool BindTexImage(unsigned target) override;
27 virtual void ReleaseTexImage(unsigned target) OVERRIDE {} 27 virtual void ReleaseTexImage(unsigned target) override {}
28 virtual bool CopyTexImage(unsigned target) OVERRIDE; 28 virtual bool CopyTexImage(unsigned target) override;
29 virtual void WillUseTexImage() OVERRIDE {} 29 virtual void WillUseTexImage() override {}
30 virtual void DidUseTexImage() OVERRIDE {} 30 virtual void DidUseTexImage() override {}
31 virtual void WillModifyTexImage() OVERRIDE {} 31 virtual void WillModifyTexImage() override {}
32 virtual void DidModifyTexImage() OVERRIDE {} 32 virtual void DidModifyTexImage() override {}
33 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 33 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
34 int z_order, 34 int z_order,
35 OverlayTransform transform, 35 OverlayTransform transform,
36 const Rect& bounds_rect, 36 const Rect& bounds_rect,
37 const RectF& crop_rect) OVERRIDE; 37 const RectF& crop_rect) override;
38 38
39 protected: 39 protected:
40 virtual ~GLImageSurfaceTexture(); 40 virtual ~GLImageSurfaceTexture();
41 41
42 private: 42 private:
43 scoped_refptr<SurfaceTexture> surface_texture_; 43 scoped_refptr<SurfaceTexture> surface_texture_;
44 const gfx::Size size_; 44 const gfx::Size size_;
45 GLint texture_id_; 45 GLint texture_id_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture); 47 DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture);
48 }; 48 };
49 49
50 } // namespace gfx 50 } // namespace gfx
51 51
52 #endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_ 52 #endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_image_stub.h ('k') | ui/gl/gl_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698