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

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

Issue 301793003: During image destroy, delete textures only if we have a GL context. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Destroy GLImage during ContextGroup destroy Created 6 years, 6 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 (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/size.h" 8 #include "ui/gfx/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 GLImage {
16 public: 16 public:
17 explicit GLImageGLX(gfx::PluginWindowHandle window); 17 explicit GLImageGLX(gfx::PluginWindowHandle window);
18 18
19 virtual bool Initialize(); 19 virtual bool Initialize();
20 20
21 // Overridden from GLImage: 21 // Overridden from GLImage:
22 virtual void Destroy() OVERRIDE; 22 virtual void Destroy(bool have_context) OVERRIDE;
reveman 2014/05/29 16:30:34 I think this will fail to compile. You need to upd
23 virtual gfx::Size GetSize() OVERRIDE; 23 virtual gfx::Size GetSize() OVERRIDE;
24 virtual bool BindTexImage(unsigned target) OVERRIDE; 24 virtual bool BindTexImage(unsigned target) OVERRIDE;
25 virtual void ReleaseTexImage(unsigned target) OVERRIDE; 25 virtual void ReleaseTexImage(unsigned target) OVERRIDE;
26 virtual void WillUseTexImage() OVERRIDE {} 26 virtual void WillUseTexImage() OVERRIDE {}
27 virtual void DidUseTexImage() OVERRIDE {} 27 virtual void DidUseTexImage() OVERRIDE {}
28 virtual void WillModifyTexImage() OVERRIDE {} 28 virtual void WillModifyTexImage() OVERRIDE {}
29 virtual void DidModifyTexImage() OVERRIDE {} 29 virtual void DidModifyTexImage() OVERRIDE {}
30 30
31 protected: 31 protected:
32 virtual ~GLImageGLX(); 32 virtual ~GLImageGLX();
33 33
34 private: 34 private:
35 XDisplay* display_; 35 XDisplay* display_;
36 gfx::PluginWindowHandle window_; 36 gfx::PluginWindowHandle window_;
37 XID pixmap_; 37 XID pixmap_;
38 XID glx_pixmap_; 38 XID glx_pixmap_;
39 gfx::Size size_; 39 gfx::Size size_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); 41 DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
42 }; 42 };
43 43
44 } // namespace gfx 44 } // namespace gfx
45 45
46 #endif // UI_GL_GL_IMAGE_GLX_H_ 46 #endif // UI_GL_GL_IMAGE_GLX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698