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

Unified Diff: ui/gl/gl_surface_glx.h

Issue 1081533003: ui: Enable virtual contexts for linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet another merge Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_driver_bug_list_json.cc ('k') | ui/gl/gl_surface_glx.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_glx.h
diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
index c1fca6006a1726b5971bd0494d284220ad61e22d..46b044fa7993c460a0486d6c38774d79ccc50982 100644
--- a/ui/gl/gl_surface_glx.h
+++ b/ui/gl/gl_surface_glx.h
@@ -44,6 +44,8 @@ class GL_EXPORT GLSurfaceGLX : public GLSurface {
protected:
~GLSurfaceGLX() override;
+ static void* GetConfig(gfx::AcceleratedWidget window);
+
private:
DISALLOW_COPY_AND_ASSIGN(GLSurfaceGLX);
};
@@ -93,9 +95,9 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX,
};
// A surface used to render to an offscreen pbuffer.
-class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
+class GL_EXPORT UnmappedNativeViewGLSurfaceGLX : public GLSurfaceGLX {
public:
- explicit PbufferGLSurfaceGLX(const gfx::Size& size);
+ explicit UnmappedNativeViewGLSurfaceGLX(const gfx::Size& size);
// Implement GLSurfaceGLX.
bool Initialize() override;
@@ -107,14 +109,15 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
void* GetConfig() override;
protected:
- ~PbufferGLSurfaceGLX() override;
+ ~UnmappedNativeViewGLSurfaceGLX() override;
private:
gfx::Size size_;
void* config_;
- XID pbuffer_;
+ // Unmapped dummy window, used to provide a compatible surface.
+ gfx::AcceleratedWidget window_;
- DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX);
+ DISALLOW_COPY_AND_ASSIGN(UnmappedNativeViewGLSurfaceGLX);
};
} // namespace gfx
« no previous file with comments | « gpu/config/gpu_driver_bug_list_json.cc ('k') | ui/gl/gl_surface_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698