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

Side by Side Diff: gpu/command_buffer/service/stream_texture_manager_in_process_android.cc

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE 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
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 #include "gpu/command_buffer/service/stream_texture_manager_in_process_android.h " 5 #include "gpu/command_buffer/service/stream_texture_manager_in_process_android.h "
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "gpu/command_buffer/service/texture_manager.h" 9 #include "gpu/command_buffer/service/texture_manager.h"
10 #include "ui/gfx/size.h" 10 #include "ui/gfx/size.h"
11 #include "ui/gl/android/surface_texture.h" 11 #include "ui/gl/android/surface_texture.h"
12 #include "ui/gl/gl_bindings.h" 12 #include "ui/gl/gl_bindings.h"
13 #include "ui/gl/gl_image.h" 13 #include "ui/gl/gl_image.h"
14 14
15 namespace gpu { 15 namespace gpu {
16 16
17 namespace { 17 namespace {
18 18
19 // Simply wraps a SurfaceTexture reference as a GLImage. 19 // Simply wraps a SurfaceTexture reference as a GLImage.
20 class GLImageImpl : public gfx::GLImage { 20 class GLImageImpl : public gfx::GLImage {
21 public: 21 public:
22 GLImageImpl(const scoped_refptr<gfx::SurfaceTexture>& surface_texture, 22 GLImageImpl(const scoped_refptr<gfx::SurfaceTexture>& surface_texture,
23 const base::Closure& release_callback); 23 const base::Closure& release_callback);
24 24
25 // implement gfx::GLImage 25 // implement gfx::GLImage
26 virtual void Destroy(bool have_context) OVERRIDE; 26 virtual void Destroy(bool have_context) override;
27 virtual gfx::Size GetSize() OVERRIDE; 27 virtual gfx::Size GetSize() override;
28 virtual bool BindTexImage(unsigned target) OVERRIDE; 28 virtual bool BindTexImage(unsigned target) override;
29 virtual void ReleaseTexImage(unsigned target) OVERRIDE; 29 virtual void ReleaseTexImage(unsigned target) override;
30 virtual bool CopyTexImage(unsigned target) OVERRIDE; 30 virtual bool CopyTexImage(unsigned target) override;
31 virtual void WillUseTexImage() OVERRIDE; 31 virtual void WillUseTexImage() override;
32 virtual void DidUseTexImage() OVERRIDE {} 32 virtual void DidUseTexImage() override {}
33 virtual void WillModifyTexImage() OVERRIDE {} 33 virtual void WillModifyTexImage() override {}
34 virtual void DidModifyTexImage() OVERRIDE {} 34 virtual void DidModifyTexImage() override {}
35 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 35 virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
36 int z_order, 36 int z_order,
37 gfx::OverlayTransform transform, 37 gfx::OverlayTransform transform,
38 const gfx::Rect& bounds_rect, 38 const gfx::Rect& bounds_rect,
39 const gfx::RectF& crop_rect) OVERRIDE; 39 const gfx::RectF& crop_rect) override;
40 40
41 private: 41 private:
42 virtual ~GLImageImpl(); 42 virtual ~GLImageImpl();
43 43
44 scoped_refptr<gfx::SurfaceTexture> surface_texture_; 44 scoped_refptr<gfx::SurfaceTexture> surface_texture_;
45 base::Closure release_callback_; 45 base::Closure release_callback_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(GLImageImpl); 47 DISALLOW_COPY_AND_ASSIGN(GLImageImpl);
48 }; 48 };
49 49
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 StreamTextureManagerInProcess::GetSurfaceTexture(uint32 stream_id) { 161 StreamTextureManagerInProcess::GetSurfaceTexture(uint32 stream_id) {
162 base::AutoLock lock(map_lock_); 162 base::AutoLock lock(map_lock_);
163 TextureMap::const_iterator it = textures_.find(stream_id); 163 TextureMap::const_iterator it = textures_.find(stream_id);
164 if (it != textures_.end()) 164 if (it != textures_.end())
165 return it->second; 165 return it->second;
166 166
167 return NULL; 167 return NULL;
168 } 168 }
169 169
170 } // namespace gpu 170 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/shader_translator_cache.h ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698