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

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, 6 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: ui/ui.gyp
===================================================================
--- ui/ui.gyp (revision 143591)
+++ ui/ui.gyp (working copy)
@@ -378,6 +378,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,16 +667,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',
@@ -683,6 +675,12 @@
'gfx/pango_util.cc',
'gfx/platform_font_pango.cc',
'gfx/platform_font_pango.h',
+ 'gfx/render_text.cc',
+ 'gfx/render_text.h',
+ 'gfx/render_text_linux.cc',
msw 2012/06/22 17:42:10 nit: sorry, but I think android builds automatical
Alexei Svitkine (slow) 2012/06/22 19:35:29 Done.
+ 'gfx/render_text_linux.h',
+ 'gfx/render_text_win.cc',
+ 'gfx/render_text_win.h',
],
}],
['OS=="linux"', {

Powered by Google App Engine
This is Rietveld 408576698