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

Unified Diff: content/content_common.gypi

Issue 14985005: Support for ozone graphics in content and gpu/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: freshened patch Created 7 years, 7 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
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 6e98cb68f72986118cb2e56f23ee5ebbe11c0fd6..4bbb5db582c70221ed6c5bebb4d67cc198d8ed19 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -243,6 +243,7 @@
'common/gpu/image_transport_surface.cc',
'common/gpu/image_transport_surface_android.cc',
'common/gpu/image_transport_surface_mac.cc',
+ 'common/gpu/image_transport_surface_ozone.cc',
'common/gpu/image_transport_surface_win.cc',
'common/gpu/image_transport_surface_x11.cc',
'common/gpu/media/h264_bit_reader.cc',
@@ -382,6 +383,13 @@
'public/common/window_container_type.cc',
'public/common/window_container_type.h',
],
+ 'target_conditions': [
+ ['<(use_ozone)==1', {
+ 'sources/': [
+ ['include', '^common/font_list_x11\\.cc$'],
+ ],
+ }],
+ ],
'conditions': [
['OS=="ios"', {
'sources/': [
@@ -437,7 +445,7 @@
'../build/linux/system.gyp:gtk',
],
}],
- ['OS=="linux"', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:pangocairo',
],

Powered by Google App Engine
This is Rietveld 408576698