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

Side by Side Diff: ui/gl/gl_image_glx.h

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gl_unittests Created 5 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GLX_H_ 5 #ifndef UI_GL_GL_IMAGE_GLX_H_
6 #define UI_GL_GL_IMAGE_GLX_H_ 6 #define UI_GL_GL_IMAGE_GLX_H_
7 7
8 #include "ui/gfx/geometry/size.h" 8 #include "ui/gfx/geometry/size.h"
9 #include "ui/gfx/x/x11_types.h" 9 #include "ui/gfx/x/x11_types.h"
10 #include "ui/gl/gl_export.h" 10 #include "ui/gl/gl_export.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 GL_EXPORT GLImageGLX : public GLImage { 15 class GL_EXPORT GLImageGLX : public gl::GLImage {
16 public: 16 public:
17 GLImageGLX(const Size& size, unsigned internalformat); 17 GLImageGLX(const Size& size, unsigned internalformat);
18 18
19 bool Initialize(XID pixmap); 19 bool Initialize(XID pixmap);
20 20
21 // Overridden from GLImage: 21 // Overridden from GLImage:
22 void Destroy(bool have_context) override; 22 void Destroy(bool have_context) override;
23 Size GetSize() override; 23 Size GetSize() override;
24 unsigned GetInternalFormat() override; 24 unsigned GetInternalFormat() override;
25 bool BindTexImage(unsigned target) override; 25 bool BindTexImage(unsigned target) override;
(...skipping 18 matching lines...) Expand all
44 XID glx_pixmap_; 44 XID glx_pixmap_;
45 const Size size_; 45 const Size size_;
46 unsigned internalformat_; 46 unsigned internalformat_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); 48 DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
49 }; 49 };
50 50
51 } // namespace gfx 51 } // namespace gfx
52 52
53 #endif // UI_GL_GL_IMAGE_GLX_H_ 53 #endif // UI_GL_GL_IMAGE_GLX_H_
OLDNEW
« ui/gl/gl_image_egl.h ('K') | « ui/gl/gl_image_egl.h ('k') | ui/gl/gl_image_io_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698