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

Unified Diff: ui/ui.gyp

Issue 10543057: Initial RenderTextMac implementation using CoreText. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/render_text_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
===================================================================
--- ui/ui.gyp (revision 147850)
+++ ui/ui.gyp (working copy)
@@ -407,6 +407,8 @@
'gfx/rect_base_impl.h',
'gfx/render_text.cc',
'gfx/render_text.h',
+ 'gfx/render_text_mac.cc',
+ 'gfx/render_text_mac.h',
'gfx/render_text_linux.cc',
'gfx/render_text_linux.h',
'gfx/render_text_win.cc',
@@ -665,14 +667,6 @@
],
},
}],
- ['OS=="android"', {
- 'sources!': [
- 'gfx/pango_util.h',
- 'gfx/pango_util.cc',
- 'gfx/platform_font_pango.h',
- 'gfx/platform_font_pango.cc',
- ],
- }],
['use_x11==1', {
'all_dependent_settings': {
'ldflags': [
@@ -695,16 +689,6 @@
'base/x/events_x.cc',
],
}],
- ['toolkit_views==0 and use_canvas_skia==0', {
- 'sources!': [
- 'gfx/render_text.cc',
- 'gfx/render_text.h',
- 'gfx/render_text_linux.cc',
- 'gfx/render_text_linux.h',
- 'gfx/render_text_win.cc',
- 'gfx/render_text_win.h',
- ],
- }],
['OS=="android"', {
'sources!': [
'base/touch/touch_factory.cc',
@@ -715,6 +699,12 @@
'gfx/platform_font_pango.h',
],
}],
+ ['OS=="android" or OS=="ios"', {
+ 'sources!': [
+ 'gfx/render_text.cc',
+ 'gfx/render_text.h',
+ ],
+ }],
['OS=="linux"', {
'libraries': [
'-ldl',
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698