| Index: ui/gfx/gl/gl_context_linux.cc
|
| diff --git a/ui/gfx/gl/gl_context_linux.cc b/ui/gfx/gl/gl_context_linux.cc
|
| index a6f75252adac24f8fd32a381181809e76d6d83d2..121abee93d29ce01e33f4ed5c21c3c10bb57ab42 100644
|
| --- a/ui/gfx/gl/gl_context_linux.cc
|
| +++ b/ui/gfx/gl/gl_context_linux.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -27,7 +27,6 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
|
| GLSurface* compatible_surface,
|
| GpuPreference gpu_preference) {
|
| switch (GetGLImplementation()) {
|
| -#if !defined(USE_WAYLAND)
|
| case kGLImplementationOSMesaGL: {
|
| scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
|
| if (!context->Initialize(compatible_surface, gpu_preference))
|
| @@ -42,7 +41,6 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
|
|
|
| return context;
|
| }
|
| -#endif
|
| case kGLImplementationEGLGLES2: {
|
| scoped_refptr<GLContext> context(new GLContextEGL(share_group));
|
| if (!context->Initialize(compatible_surface, gpu_preference))
|
|
|