Remove WAYLAND port

Also removed skia/ext/canvas_paint_x.h which is not in use. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10009024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131219 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Apr 7, 2012 · 328ce55 · 328ce55
1 parent 9d7a49d
commit 328ce55
Show file tree

Hide file tree

Showing 60 changed files with 23 additions and 2,376 deletions.
diff --git a/base/base.gypi b/base/base.gypi
@@ -400,7 +400,6 @@
           'nix/mime_util_xdg.h',
           'nix/xdg_util.cc',
           'nix/xdg_util.h',
-          'wayland/wayland_event.h',
           'win/accessibility_misc_utils.h',
           'win/accessibility_misc_utils.cc',
           'win/enum_variant.h',
@@ -478,12 +477,6 @@
             'sources!' : [ 'message_pump_gtk.cc', ],
             'sources/' : [ [ 'include', '^message_pump_x\\.cc$', ] ],
           }],
-          [ 'use_wayland==1', {
-            'sources/': [
-              [ 'exclude', '^message_pump_gtk\\.cc$',],
-              [ 'exclude', '^message_pump_x\\.cc$',],
-            ],
-          }],
           [ 'OS != "linux" and os_bsd != 1', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
@@ -783,7 +776,6 @@
         'message_pump_libevent.h',
         'message_pump_mac.h',
         'message_pump_mac.mm',
-        'message_pump_wayland.h',
         'metrics/field_trial.cc',
         'metrics/field_trial.h',
         'string16.cc',

diff --git a/base/event_types.h b/base/event_types.h
@@ -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.
 
@@ -10,12 +10,6 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
-#elif defined(USE_WAYLAND)
-namespace base {
-namespace wayland {
-union WaylandEvent;
-}
-}
 #elif defined(USE_X11)
 typedef union _XEvent XEvent;
 #elif defined(OS_MACOSX)
@@ -31,8 +25,6 @@ namespace base {
 // Cross platform typedefs for native event types.
 #if defined(OS_WIN)
 typedef MSG NativeEvent;
-#elif defined(USE_WAYLAND)
-typedef wayland::WaylandEvent* NativeEvent;
 #elif defined(USE_X11)
 typedef XEvent* NativeEvent;
 #elif defined(OS_MACOSX)

diff --git a/base/message_loop.h b/base/message_loop.h
@@ -31,9 +31,7 @@
 #include "base/message_pump_libevent.h"
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
-#if defined(USE_WAYLAND)
-#include "base/message_pump_wayland.h"
-#elif defined(USE_AURA)
+#if defined(USE_AURA)
 #include "base/message_pump_x.h"
 #else
 #include "base/message_pump_gtk.h"

diff --git a/base/message_pump_wayland.h b/base/message_pump_wayland.h
diff --git a/base/wayland/wayland_event.h b/base/wayland/wayland_event.h
diff --git a/build/all.gyp b/build/all.gyp
@@ -90,11 +90,6 @@
             }],
           ],
         }],
-        ['use_wayland==1', {
-          'dependencies': [
-            '../ui/wayland/wayland.gyp:*',
-          ],
-        }],
         ['toolkit_uses_gtk==1', {
           'dependencies': [
             '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',

diff --git a/build/common.gypi b/build/common.gypi
@@ -518,9 +518,6 @@
     'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
     'enable_task_manager%': '<(enable_task_manager)',
 
-    # Whether to build for Wayland display server
-    'use_wayland%': 0,
-
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
 
@@ -1207,9 +1204,6 @@
       ['use_xi2_mt!=0', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],
-      ['use_wayland==1', {
-        'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
-      }],
       ['file_manager_extension==1', {
         'defines': ['FILE_MANAGER_EXTENSION=1'],
       }],

diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi
@@ -80,12 +80,5 @@
                     ['exclude', '(^|/)ash/'],
       ]
     }],
-    ['use_wayland!=1', {
-      'sources/': [
-        ['exclude', '_(wayland)(_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)wayland/'],
-        ['exclude', '(^|/)(wayland)_[^/]*\\.(h|cc)$'],
-      ],
-    }],
   ]
 }
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
@@ -608,30 +608,6 @@
         }],
       ],
     },
-    {
-      'target_name': 'wayland',
-      'type': 'none',
-      'conditions': [
-        ['use_wayland == 1', {
-          'cflags': [
-            '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
-          ],
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other wayland-client wayland-egl xkbcommon)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcommon)',
-            ],
-          },
-        }],
-      ],
-    },
     {
       'target_name': 'udev',
       'type': 'none',

diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -10,16 +10,11 @@
 #include <X11/XKBlib.h>
 #undef Status
 
+#include "base/message_pump_x.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "ui/base/x/x11_util.h"
 
-#if defined(USE_WAYLAND)
-#include "base/message_pump_wayland.h"
-#else
-#include "base/message_pump_x.h"
-#endif
-
 namespace chromeos {
 
 namespace {

diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/view.h"
 

diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -23,7 +23,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"

diff --git a/content/browser/renderer_host/image_transport_client_linux.cc b/content/browser/renderer_host/image_transport_client_linux.cc
@@ -83,8 +83,6 @@ class ImageTransportClientEGL : public ImageTransportClient {
   EGLImageKHR image_;
 };
 
-#if !defined(USE_WAYLAND)
-
 class ImageTransportClientGLX : public ImageTransportClient {
  public:
   ImageTransportClientGLX(ImageTransportFactory* factory, const gfx::Size& size)
@@ -289,20 +287,16 @@ class ImageTransportClientOSMesa : public ImageTransportClient {
 };
 uint32 ImageTransportClientOSMesa::next_handle_ = 0;
 
-#endif //  !USE_WAYLAND
-
 }  // anonymous namespace
 
 ImageTransportClient* ImageTransportClient::Create(
     ImageTransportFactory* factory,
     const gfx::Size& size) {
   switch (gfx::GetGLImplementation()) {
-#if !defined(USE_WAYLAND)
     case gfx::kGLImplementationOSMesaGL:
       return new ImageTransportClientOSMesa(factory, size);
     case gfx::kGLImplementationDesktopGL:
       return new ImageTransportClientGLX(factory, size);
-#endif
     case gfx::kGLImplementationEGLGLES2:
       return new ImageTransportClientEGL(factory, size);
     default:

diff --git a/skia/ext/canvas_paint.h b/skia/ext/canvas_paint.h
@@ -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.
 
@@ -14,12 +14,10 @@
 #elif defined(__APPLE__)
 #include "skia/ext/canvas_paint_mac.h"
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
-#if defined(USE_WAYLAND)
-#include "skia/ext/canvas_paint_wayland.h"
-#elif defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_GTK)
 #include "skia/ext/canvas_paint_gtk.h"
 #else
-#include "skia/ext/canvas_paint_x.h"
+#error "No canvas paint for this platform"
 #endif
 #endif