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

Unified Diff: ui/ui.gyp

Issue 22835002: Supports gfx::FontList in gfx::Canvas and ui::ElideText family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/NOTREACHED/NOTIMPLEMENTED/ Created 7 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
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 2aa50d4d259fb6e69234600b1420bda47af1efef..95d2fad1dafcb3276d69159cf4125182663b5e93 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -418,13 +418,14 @@
'gfx/canvas.cc',
'gfx/canvas.h',
'gfx/canvas_android.cc',
+ 'gfx/canvas_ios.mm',
'gfx/canvas_mac.mm',
+ 'gfx/canvas_paint_gtk.cc',
'gfx/canvas_paint_gtk.h',
'gfx/canvas_paint_mac.h',
- 'gfx/canvas_paint_win.h',
- 'gfx/canvas_paint_gtk.cc',
'gfx/canvas_paint_mac.mm',
'gfx/canvas_paint_win.cc',
+ 'gfx/canvas_paint_win.h',
'gfx/canvas_skia.cc',
'gfx/canvas_skia_paint.h',
'gfx/codec/jpeg_codec.cc',
@@ -622,6 +623,7 @@
['include', '_ios\\.(cc|mm)$'],
['include', '(^|/)ios/'],
['include', '^gfx/'],
+ ['exclude', '^gfx/canvas\\.cc$'],
msw 2013/08/19 19:05:43 What specifically doesn't compile in canvas.cc on
['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
['include', '^base/animation/'],
['include', '^base/l10n/'],

Powered by Google App Engine
This is Rietveld 408576698