| OLD | NEW |
| 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_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ | 5 #ifndef UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ |
| 6 #define UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ | 6 #define UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "ui/ozone/demo/gl_renderer.h" | 11 #include "ui/ozone/demo/gl_renderer.h" |
| 11 | 12 |
| 12 namespace gl { | 13 namespace gl { |
| 13 class GLImage; | 14 class GLImage; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| 17 | 18 |
| 18 class SurfacelessGlRenderer : public GlRenderer { | 19 class SurfacelessGlRenderer : public GlRenderer { |
| 19 public: | 20 public: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 42 | 43 |
| 43 private: | 44 private: |
| 44 gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget; | 45 gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget; |
| 45 gfx::Size size_; | 46 gfx::Size size_; |
| 46 | 47 |
| 47 scoped_refptr<gl::GLImage> image_; | 48 scoped_refptr<gl::GLImage> image_; |
| 48 unsigned int gl_fb_ = 0; | 49 unsigned int gl_fb_ = 0; |
| 49 unsigned int gl_tex_ = 0; | 50 unsigned int gl_tex_ = 0; |
| 50 }; | 51 }; |
| 51 | 52 |
| 52 scoped_ptr<BufferWrapper> buffers_[2]; | 53 std::unique_ptr<BufferWrapper> buffers_[2]; |
| 53 int back_buffer_ = 0; | 54 int back_buffer_ = 0; |
| 54 | 55 |
| 55 base::WeakPtrFactory<SurfacelessGlRenderer> weak_ptr_factory_; | 56 base::WeakPtrFactory<SurfacelessGlRenderer> weak_ptr_factory_; |
| 56 | 57 |
| 57 DISALLOW_COPY_AND_ASSIGN(SurfacelessGlRenderer); | 58 DISALLOW_COPY_AND_ASSIGN(SurfacelessGlRenderer); |
| 58 }; | 59 }; |
| 59 | 60 |
| 60 } // namespace ui | 61 } // namespace ui |
| 61 | 62 |
| 62 #endif // UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ | 63 #endif // UI_OZONE_DEMO_SURFACELESS_GL_RENDERER_H_ |
| OLD | NEW |