Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: ui/gfx/surface/surface.gyp

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Adding missing WaylandDisplay include Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/surface/accelerated_surface_wayland.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/surface/surface.gyp
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp
index 17f372cdeddb1bec760f29a4c0dda0f3d088e3f0..9e7081df39851b0a3dc0fc1853707c601fb31faf 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 or 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',
+ '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'],
+ ],
+ }],
+ ],
},
],
}
« no previous file with comments | « ui/gfx/surface/accelerated_surface_wayland.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698