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

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

Issue 2449993005: Remove GLImage::Destroy(). (Closed)
Patch Set: One more Destroy() call on Mac. Created 4 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
« no previous file with comments | « ui/gl/gl_image_egl.cc ('k') | ui/gl/gl_image_glx.cc » ('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 (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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/gfx/geometry/size.h" 11 #include "ui/gfx/geometry/size.h"
12 #include "ui/gfx/x/x11_types.h" 12 #include "ui/gfx/x/x11_types.h"
13 #include "ui/gl/gl_export.h" 13 #include "ui/gl/gl_export.h"
14 #include "ui/gl/gl_image.h" 14 #include "ui/gl/gl_image.h"
15 15
16 namespace gl { 16 namespace gl {
17 17
18 class GL_EXPORT GLImageGLX : public GLImage { 18 class GL_EXPORT GLImageGLX : public GLImage {
19 public: 19 public:
20 GLImageGLX(const gfx::Size& size, unsigned internalformat); 20 GLImageGLX(const gfx::Size& size, unsigned internalformat);
21 21
22 bool Initialize(XID pixmap); 22 bool Initialize(XID pixmap);
23 23
24 // Overridden from GLImage: 24 // Overridden from GLImage:
25 void Destroy(bool have_context) override;
26 gfx::Size GetSize() override; 25 gfx::Size GetSize() override;
27 unsigned GetInternalFormat() override; 26 unsigned GetInternalFormat() override;
28 bool BindTexImage(unsigned target) override; 27 bool BindTexImage(unsigned target) override;
29 void ReleaseTexImage(unsigned target) override; 28 void ReleaseTexImage(unsigned target) override;
30 bool CopyTexImage(unsigned target) override; 29 bool CopyTexImage(unsigned target) override;
31 bool CopyTexSubImage(unsigned target, 30 bool CopyTexSubImage(unsigned target,
32 const gfx::Point& offset, 31 const gfx::Point& offset,
33 const gfx::Rect& rect) override; 32 const gfx::Rect& rect) override;
34 bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 33 bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
35 int z_order, 34 int z_order,
(...skipping 12 matching lines...) Expand all
48 XID glx_pixmap_; 47 XID glx_pixmap_;
49 const gfx::Size size_; 48 const gfx::Size size_;
50 unsigned internalformat_; 49 unsigned internalformat_;
51 50
52 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); 51 DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
53 }; 52 };
54 53
55 } // namespace gl 54 } // namespace gl
56 55
57 #endif // UI_GL_GL_IMAGE_GLX_H_ 56 #endif // UI_GL_GL_IMAGE_GLX_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_image_egl.cc ('k') | ui/gl/gl_image_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698