Adding Wayland support for ui/gfx

ui/gfx/surface/surface.gyp

Index: ui/gfx/surface/surface.gyp
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp
index 17f372cdeddb1bec760f29a4c0dda0f3d088e3f0..c528c9b67823ac95500aca93f5c16dc0d1deb95b 100644
--- a/ui/gfx/surface/surface.gyp
+++ b/ui/gfx/surface/surface.gyp
@@ -9,7 +9,7 @@
 
   'target_defaults': {
     'conditions': [
-      ['toolkit_uses_gtk == 1', {
+      ['toolkit_uses_gtk == 1 and use_wayland != 1', {
         'include_dirs': [
           '<(DEPTH)/third_party/angle/include',
         ],
@@ -31,6 +31,8 @@
         'accelerated_surface_linux.h',
         'accelerated_surface_mac.cc',
         'accelerated_surface_mac.h',
+        'accelerated_surface_wayland.cc',

[sky, 2011/07/27 15:51:05]

Don't you need to exclude these everywhere unless wayland is defined?

+        'accelerated_surface_wayland.h',
         'io_surface_support_mac.cc',
         'io_surface_support_mac.h',
         'transport_dib.h',
@@ -38,6 +40,14 @@
         'transport_dib_mac.cc',
         'transport_dib_win.cc',
       ],
+      'conditions': [
+        ['use_wayland == 1', {
+          'sources/': [
+            ['exclude', 'accelerated_surface_linux.cc'],
+            ['exclude', 'accelerated_surface_linux.h'],
+          ],
+        }],
+      ],
     },
   ],
 }