| 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_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 <stdint.h> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 9 #include "base/threading/thread_checker.h" | 12 #include "base/threading/thread_checker.h" |
| 10 #include "ui/gl/gl_bindings.h" | 13 #include "ui/gl/gl_bindings.h" |
| 11 #include "ui/gl/gl_image.h" | 14 #include "ui/gl/gl_image.h" |
| 12 | 15 |
| 13 namespace gfx { | 16 namespace gfx { |
| 14 class SurfaceTexture; | 17 class SurfaceTexture; |
| 15 } | 18 } |
| 16 | 19 |
| 17 namespace gl { | 20 namespace gl { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 const gfx::Size size_; | 52 const gfx::Size size_; |
| 50 GLint texture_id_; | 53 GLint texture_id_; |
| 51 base::ThreadChecker thread_checker_; | 54 base::ThreadChecker thread_checker_; |
| 52 | 55 |
| 53 DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture); | 56 DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture); |
| 54 }; | 57 }; |
| 55 | 58 |
| 56 } // namespace gl | 59 } // namespace gl |
| 57 | 60 |
| 58 #endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_ | 61 #endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1545113002:
Switch to standard integer types in ui/gl/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master