| Index: ui/gl/gl_surface_egl.h
|
| diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
|
| index 25085f4e21ce754dc54e1cc57e1267eec602480e..2f4ebbe71cf18f4d591cda5cdc2869177c76bab1 100644
|
| --- a/ui/gl/gl_surface_egl.h
|
| +++ b/ui/gl/gl_surface_egl.h
|
| @@ -53,6 +53,7 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
|
| // Implement GLSurface.
|
| EGLDisplay GetDisplay() override;
|
| EGLConfig GetConfig() override;
|
| + GLSurface::Format GetDefaultFormat() const override;
|
|
|
| static bool InitializeOneOff();
|
| static EGLDisplay GetHardwareDisplay();
|
| @@ -72,7 +73,6 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
|
| ~GLSurfaceEGL() override;
|
|
|
| EGLConfig config_;
|
| - GLSurface::Format format_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(GLSurfaceEGL);
|
| @@ -84,7 +84,7 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
|
| explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window);
|
|
|
| // Implement GLSurface.
|
| - bool Initialize() override;
|
| + using GLSurface::Initialize;
|
| bool Initialize(GLSurface::Format format) override;
|
| void Destroy() override;
|
| bool Resize(const gfx::Size& size,
|
|
|