diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 04:05:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 04:05:01 +0000 |
| commit | d07b6b5b992faad3506ac004503c11d25930cdca (patch) | |
| tree | a5a795b8980d90e4a10208ad4f8eabe140ee3e5e /gfx/gfx.gyp | |
| parent | f2a13d89ca22cdbe3808bcb14e02d5baee8d33b3 (diff) | |
| download | chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.zip chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.tar.gz chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.tar.bz2 | |
Move app/gfx/canvas and app/gfx/font to gfx/.
TBR=darin
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1132006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/gfx.gyp')
| -rw-r--r-- | gfx/gfx.gyp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index 8a33525..4b7d612 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -20,6 +20,7 @@ 'codec/jpeg_codec_unittest.cc', 'codec/png_codec_unittest.cc', 'color_utils_unittest.cc', + 'font_unittest.cc', 'insets_unittest.cc', 'rect_unittest.cc', 'run_all_unittests.cc', @@ -61,6 +62,11 @@ 'sources': [ 'blit.cc', 'blit.h', + 'canvas.cc', + 'canvas.h', + 'canvas_linux.cc', + 'canvas_mac.mm', + 'canvas_win.cc', 'codec/jpeg_codec.cc', 'codec/jpeg_codec.h', 'codec/png_codec.cc', @@ -68,6 +74,11 @@ 'color_utils.cc', 'color_utils.h', 'favicon_size.h', + 'font.h', + 'font_gtk.cc', + 'font_mac.mm', + 'font_skia.cc', + 'font_win.cc', 'gfx_paths.cc', 'gfx_paths.h', 'insets.cc', @@ -104,6 +115,11 @@ ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'dependencies': [ + # font_gtk.cc uses fontconfig. + # TODO(evanm): I think this is wrong; it should just use GTK. + '../build/linux/system.gyp:fontconfig', + ], 'sources': [ 'gtk_native_view_id_manager.cc', 'gtk_native_view_id_manager.h', |