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

Unified Diff: ui/gl/gl_context_glx.h

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « ui/gl/gl_context_egl.h ('k') | ui/gl/gl_egl_api_implementation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_glx.h
diff --git a/ui/gl/gl_context_glx.h b/ui/gl/gl_context_glx.h
index ca53403e5594f55f2f6615b125b4cf48578a5bf6..fe3d75497aaf014a4e6d38fb10394b344d7a3af7 100644
--- a/ui/gl/gl_context_glx.h
+++ b/ui/gl/gl_context_glx.h
@@ -24,20 +24,20 @@ class GL_EXPORT GLContextGLX : public GLContextReal {
XDisplay* display();
// Implement GLContext.
- virtual bool Initialize(
- GLSurface* compatible_surface, GpuPreference gpu_preference) override;
- virtual void Destroy() override;
- virtual bool MakeCurrent(GLSurface* surface) override;
- virtual void ReleaseCurrent(GLSurface* surface) override;
- virtual bool IsCurrent(GLSurface* surface) override;
- virtual void* GetHandle() override;
- virtual void SetSwapInterval(int interval) override;
- virtual std::string GetExtensions() override;
- virtual bool GetTotalGpuMemory(size_t* bytes) override;
- virtual bool WasAllocatedUsingRobustnessExtension() override;
+ bool Initialize(GLSurface* compatible_surface,
+ GpuPreference gpu_preference) override;
+ void Destroy() override;
+ bool MakeCurrent(GLSurface* surface) override;
+ void ReleaseCurrent(GLSurface* surface) override;
+ bool IsCurrent(GLSurface* surface) override;
+ void* GetHandle() override;
+ void SetSwapInterval(int interval) override;
+ std::string GetExtensions() override;
+ bool GetTotalGpuMemory(size_t* bytes) override;
+ bool WasAllocatedUsingRobustnessExtension() override;
protected:
- virtual ~GLContextGLX();
+ ~GLContextGLX() override;
private:
void* context_;
« no previous file with comments | « ui/gl/gl_context_egl.h ('k') | ui/gl/gl_egl_api_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698