Remove WAYLAND port

ui/gfx/gl/gl_surface_linux.cc

 // 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.
 
 #include "ui/gfx/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#if !defined(USE_WAYLAND)
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#endif
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface_egl.h"
-#if !defined(USE_WAYLAND)
 #include "ui/gfx/gl/gl_surface_glx.h"
 #include "ui/gfx/gl/gl_surface_osmesa.h"
-#endif
 #include "ui/gfx/gl/gl_surface_stub.h"
 
 namespace gfx {
 
-#if !defined(USE_WAYLAND)
-
 namespace {
 Display* g_osmesa_display;
 }  // namespace anonymous
 
 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a
 // view.
 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
  public:
   explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window);
   virtual ~NativeViewGLSurfaceOSMesa();
@@ skipping 11 matching lines @@
 
  private:
   GC window_graphics_context_;
   gfx::AcceleratedWidget window_;
   GC pixmap_graphics_context_;
   Pixmap pixmap_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceOSMesa);
 };
 
-#endif //  !USE_WAYLAND
-
 bool GLSurface::InitializeOneOffInternal() {
   switch (GetGLImplementation()) {
-#if !defined(USE_WAYLAND)
     case kGLImplementationDesktopGL:
       if (!GLSurfaceGLX::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceGLX::InitializeOneOff failed.";
         return false;
       }
       break;
     case kGLImplementationOSMesaGL:
       if (!NativeViewGLSurfaceOSMesa::InitializeOneOff()) {
         LOG(ERROR) << "NativeViewGLSurfaceOSMesa::InitializeOneOff failed.";
         return false;
       }
       break;
-#endif
     case kGLImplementationEGLGLES2:
       if (!GLSurfaceEGL::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
         return false;
       }
       break;
     default:
       break;
   }
 
   return true;
 }
 
-#if !defined(USE_WAYLAND)
-
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::AcceleratedWidget window)
   : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)),
     window_graphics_context_(0),
     window_(window),
     pixmap_graphics_context_(0),
     pixmap_(0) {
   DCHECK(window);
 }
 
@@ skipping 165 matching lines @@
             pixmap_,
             window_,
             window_graphics_context_,
             x, y,
             width, height,
             x, y);
 
   return true;
 }
 
-#endif //  !USE_WAYLAND
-
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
     bool software,
     gfx::AcceleratedWidget window) {
   if (software)
     return NULL;
 
   switch (GetGLImplementation()) {
-#if !defined(USE_WAYLAND)
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLSurface> surface(
           new NativeViewGLSurfaceOSMesa(window));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationDesktopGL: {
       scoped_refptr<GLSurface> surface(new NativeViewGLSurfaceGLX(
           window));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
-#endif
     case kGLImplementationEGLGLES2: {
       scoped_refptr<GLSurface> surface(new NativeViewGLSurfaceEGL(
           false, window));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(
     bool software,
     const gfx::Size& size) {
   if (software)
     return NULL;
 
   switch (GetGLImplementation()) {
-#if !defined(USE_WAYLAND)
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLSurface> surface(new GLSurfaceOSMesa(OSMESA_RGBA,
                                                            size));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationDesktopGL: {
       scoped_refptr<GLSurface> surface(new PbufferGLSurfaceGLX(size));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
-#endif
     case kGLImplementationEGLGLES2: {
       scoped_refptr<GLSurface> surface(new PbufferGLSurfaceEGL(false, size));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx