Move app/gfx/canvas and app/gfx/font to gfx/.

gfx/gfx.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'gfx_unittests',
       'type': 'executable',
       'msvs_guid': 'C8BD2821-EAE5-4AC6-A0E4-F82CAC2956CC',
       'dependencies': [
         'gfx',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         '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',
         'skbitmap_operations_unittest.cc',
         'test_suite.h',
       ],
       'include_dirs': [
         '..',
       ],
       'conditions': [
@@ skipping 21 matching lines @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjpeg/libjpeg.gyp:libjpeg',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
       ],
       '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',
         'codec/png_codec.h',
         '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',
         'insets.h',
         'native_widget_types.h',
         'path.cc',
         'path.h',
         'path_gtk.cc',
         'path_win.cc',
         'point.cc',
@@ skipping 16 matching lines @@
           'sources': [
             'gdi_util.cc',
             'gdi_util.h',
             'icon_util.cc',
             'icon_util.h',
             'native_theme_win.cc',
             'native_theme_win.h',
           ],
         }],
         ['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',
             'gtk_util.cc',
             'gtk_util.h',
             'native_widget_types_gtk.cc',
           ],
         }],
       ],
     },    
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: