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

Unified Diff: ui/gl/gl_surface.h

Issue 2024953002: Move GL one-off initialization code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_x11
Patch Set: Delete GLInitializer class. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_implementation.h ('k') | ui/gl/gl_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface.h
diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
index fb13627e72e721be44f32eebaa4504de97b146b6..49d0acc632066e78021b1367634659e3bb76fb01 100644
--- a/ui/gl/gl_surface.h
+++ b/ui/gl/gl_surface.h
@@ -128,10 +128,6 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
// the calling thread (i.e. same thread CommitOverlayPlanesAsync is called).
virtual void CommitOverlayPlanesAsync(const SwapCompletionCallback& callback);
- // Initialize GL bindings.
- // DEPRECATED(kylechar): Use gl::init::InitializeGLOneOff from gl_factory.h.
- static bool InitializeOneOff();
-
// Called after a context is made current with this surface. Returns false
// on error.
virtual bool OnMakeCurrent(GLContext* context);
@@ -226,11 +222,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
protected:
virtual ~GLSurface();
- static bool InitializeOneOffImplementation(GLImplementation impl,
- bool fallback_to_osmesa,
- bool gpu_service_logging,
- bool disable_gl_drawing);
- static bool InitializeOneOffInternal();
+
static void SetCurrent(GLSurface* surface);
static bool ExtensionsContain(const char* extensions, const char* name);
@@ -238,7 +230,6 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
private:
friend class base::RefCounted<GLSurface>;
friend class GLContext;
- friend class GLSurfaceTestSupport;
DISALLOW_COPY_AND_ASSIGN(GLSurface);
};
« no previous file with comments | « ui/gl/gl_implementation.h ('k') | ui/gl/gl_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698