| Index: ui/gl/gl_surface_egl.h
|
| diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
|
| index b0b33367cb36366d5b514d37268451acabc3b799..073684bdc1e785784d9eeca13bc89b6757c21714 100644
|
| --- a/ui/gl/gl_surface_egl.h
|
| +++ b/ui/gl/gl_surface_egl.h
|
| @@ -29,7 +29,7 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
|
| GLSurfaceEGL();
|
|
|
| // Implement GLSurface.
|
| - virtual EGLDisplay GetDisplay() override;
|
| + EGLDisplay GetDisplay() override;
|
|
|
| static bool InitializeOneOff();
|
| static EGLDisplay GetHardwareDisplay();
|
| @@ -44,7 +44,7 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
|
| static bool IsEGLSurfacelessContextSupported();
|
|
|
| protected:
|
| - virtual ~GLSurfaceEGL();
|
| + ~GLSurfaceEGL() override;
|
|
|
| private:
|
| #if defined(OS_WIN)
|
| @@ -60,25 +60,25 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
|
| explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window);
|
|
|
| // Implement GLSurface.
|
| - virtual EGLConfig GetConfig() override;
|
| - virtual bool Initialize() override;
|
| - virtual void Destroy() override;
|
| - virtual bool Resize(const gfx::Size& size) override;
|
| - virtual bool Recreate() override;
|
| - virtual bool IsOffscreen() override;
|
| - virtual bool SwapBuffers() override;
|
| - virtual gfx::Size GetSize() override;
|
| - virtual EGLSurface GetHandle() override;
|
| - virtual bool SupportsPostSubBuffer() override;
|
| - virtual bool PostSubBuffer(int x, int y, int width, int height) override;
|
| - virtual VSyncProvider* GetVSyncProvider() override;
|
| + EGLConfig GetConfig() override;
|
| + bool Initialize() override;
|
| + void Destroy() override;
|
| + bool Resize(const gfx::Size& size) override;
|
| + bool Recreate() override;
|
| + bool IsOffscreen() override;
|
| + bool SwapBuffers() override;
|
| + gfx::Size GetSize() override;
|
| + EGLSurface GetHandle() override;
|
| + bool SupportsPostSubBuffer() override;
|
| + bool PostSubBuffer(int x, int y, int width, int height) override;
|
| + VSyncProvider* GetVSyncProvider() override;
|
|
|
| // Create a NativeViewGLSurfaceEGL with an externally provided VSyncProvider.
|
| // Takes ownership of the VSyncProvider.
|
| virtual bool Initialize(scoped_ptr<VSyncProvider> sync_provider);
|
|
|
| protected:
|
| - virtual ~NativeViewGLSurfaceEGL();
|
| + ~NativeViewGLSurfaceEGL() override;
|
|
|
| EGLNativeWindowType window_;
|
|
|
| @@ -99,18 +99,18 @@ class GL_EXPORT PbufferGLSurfaceEGL : public GLSurfaceEGL {
|
| explicit PbufferGLSurfaceEGL(const gfx::Size& size);
|
|
|
| // Implement GLSurface.
|
| - virtual EGLConfig GetConfig() override;
|
| - virtual bool Initialize() override;
|
| - virtual void Destroy() override;
|
| - virtual bool IsOffscreen() override;
|
| - virtual bool SwapBuffers() override;
|
| - virtual gfx::Size GetSize() override;
|
| - virtual bool Resize(const gfx::Size& size) override;
|
| - virtual EGLSurface GetHandle() override;
|
| - virtual void* GetShareHandle() override;
|
| + EGLConfig GetConfig() override;
|
| + bool Initialize() override;
|
| + void Destroy() override;
|
| + bool IsOffscreen() override;
|
| + bool SwapBuffers() override;
|
| + gfx::Size GetSize() override;
|
| + bool Resize(const gfx::Size& size) override;
|
| + EGLSurface GetHandle() override;
|
| + void* GetShareHandle() override;
|
|
|
| protected:
|
| - virtual ~PbufferGLSurfaceEGL();
|
| + ~PbufferGLSurfaceEGL() override;
|
|
|
| private:
|
| gfx::Size size_;
|
| @@ -127,18 +127,18 @@ class GL_EXPORT SurfacelessEGL : public GLSurfaceEGL {
|
| explicit SurfacelessEGL(const gfx::Size& size);
|
|
|
| // Implement GLSurface.
|
| - virtual EGLConfig GetConfig() override;
|
| - virtual bool Initialize() override;
|
| - virtual void Destroy() override;
|
| - virtual bool IsOffscreen() override;
|
| - virtual bool SwapBuffers() override;
|
| - virtual gfx::Size GetSize() override;
|
| - virtual bool Resize(const gfx::Size& size) override;
|
| - virtual EGLSurface GetHandle() override;
|
| - virtual void* GetShareHandle() override;
|
| + EGLConfig GetConfig() override;
|
| + bool Initialize() override;
|
| + void Destroy() override;
|
| + bool IsOffscreen() override;
|
| + bool SwapBuffers() override;
|
| + gfx::Size GetSize() override;
|
| + bool Resize(const gfx::Size& size) override;
|
| + EGLSurface GetHandle() override;
|
| + void* GetShareHandle() override;
|
|
|
| protected:
|
| - virtual ~SurfacelessEGL();
|
| + ~SurfacelessEGL() override;
|
|
|
| private:
|
| gfx::Size size_;
|
|
|