| Index: ui/gl/gl_surface_osmesa.cc
|
| diff --git a/ui/gl/gl_surface_osmesa.cc b/ui/gl/gl_surface_osmesa.cc
|
| index 7825942f7707dfe1a404c089a72e7222a2aaab4f..72f9c9611cacc2ffb6a6a037bdddf315138b85c5 100644
|
| --- a/ui/gl/gl_surface_osmesa.cc
|
| +++ b/ui/gl/gl_surface_osmesa.cc
|
| @@ -20,10 +20,10 @@ GLSurfaceOSMesa::GLSurfaceOSMesa(OSMesaSurfaceFormat format,
|
| : size_(size) {
|
| switch (format) {
|
| case OSMesaSurfaceFormatBGRA:
|
| - format_ = OSMESA_BGRA;
|
| + format_ = static_cast<GLSurface::Format>(OSMESA_BGRA);
|
| break;
|
| case OSMesaSurfaceFormatRGBA:
|
| - format_ = OSMESA_RGBA;
|
| + format_ = static_cast<GLSurface::Format>(OSMESA_RGBA);
|
| break;
|
| }
|
| // Implementations of OSMesa surface do not support having a 0 size. In such
|
| @@ -102,7 +102,7 @@ void* GLSurfaceOSMesa::GetHandle() {
|
| return buffer_.get();
|
| }
|
|
|
| -unsigned GLSurfaceOSMesa::GetFormat() {
|
| +GLSurface::Format GLSurfaceOSMesa::GetFormat() {
|
| return format_;
|
| }
|
|
|
|
|