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

Unified Diff: content/content_common.gypi

Issue 701033005: content: Move type selection logic out of GpuMemoryBufferImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review feedback Created 6 years, 1 month 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 | « content/common/gpu/gpu_memory_buffer_factory_io_surface.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5f2ab23f1b9176d2c30fc1e95f4b7a57915401c6..7f6ce0940801d59a599191d7d1f511a407464e1c 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -268,6 +268,7 @@
'common/gpu/client/gpu_memory_buffer_impl_android.cc',
'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
'common/gpu/client/gpu_memory_buffer_impl_mac.cc',
+ 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
'common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc',
@@ -916,13 +917,19 @@
'../ui/ozone/ozone.gyp:ozone',
'../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu',
],
- 'sources': [
- 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
- ],
'sources!': [
'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
'common/gpu/gpu_memory_buffer_factory_linux.cc',
],
+ }, { # use_ozone!=1
+ 'sources!': [
+ 'common/cursors/webcursor_ozone.cc',
+ 'common/font_list_ozone.cc',
+ 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
+ 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
+ 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
+ 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
+ ],
}],
],
}
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_io_surface.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698