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); |
}; |