diff options
| author | jinsukkim <jinsukkim@chromium.org> | 2016-03-08 14:50:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 22:52:25 +0000 |
| commit | 235604c882141ec676951ff116dc62a052896de3 (patch) | |
| tree | b74a5c7349c002fa41e6795e5791732d1601c91f | |
| parent | 02735a10d6ed24cfcfcee0512868c7a536f7fdae (diff) | |
| download | chromium_src-235604c882141ec676951ff116dc62a052896de3.zip chromium_src-235604c882141ec676951ff116dc62a052896de3.tar.gz chromium_src-235604c882141ec676951ff116dc62a052896de3.tar.bz2 | |
Override GLSurface::GetFormat() for GLSurfaceEGL
This returns the correct surface format to the classes
inherited from |GLSurfaceEGL|.
BUG=591210
Review URL: https://codereview.chromium.org/1769163003
Cr-Commit-Position: refs/heads/master@{#379950}
| -rw-r--r-- | ui/gl/gl_surface_egl.cc | 4 | ||||
| -rw-r--r-- | ui/gl/gl_surface_egl.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index 8c3ed9fa..a38ada3 100644 --- a/ui/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.cc @@ -500,6 +500,10 @@ bool GLSurfaceEGL::InitializeOneOff() { return true; } +GLSurface::Format GLSurfaceEGL::GetFormat() { + return format_; +} + EGLDisplay GLSurfaceEGL::GetDisplay() { return g_display; } diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index 9eb3d416..174715d 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 GetFormat() override; static bool InitializeOneOff(); static EGLDisplay GetHardwareDisplay(); |