diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 18:58:10 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 18:58:10 +0000 |
| commit | bc0ed92df7d13cb2240986b47b61843f3bd0257a (patch) | |
| tree | 134bf062352f58125134629df3697c566df2af5e /ui/ui.gyp | |
| parent | 5bad412455854bb1c0393d86ec6a989c0deb52c9 (diff) | |
| download | chromium_src-bc0ed92df7d13cb2240986b47b61843f3bd0257a.zip chromium_src-bc0ed92df7d13cb2240986b47b61843f3bd0257a.tar.gz chromium_src-bc0ed92df7d13cb2240986b47b61843f3bd0257a.tar.bz2 | |
Bring up of gfx/font on iOS.
The specific platform implementation was already there, but it was not
included in iOS.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11026033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 34 |
1 files changed, 20 insertions, 14 deletions
@@ -68,6 +68,8 @@ 'base/ui_base_switches.cc', 'base/ui_base_switches.h', 'base/ui_export.h', + 'gfx/font.h', + 'gfx/font.cc', 'gfx/image/image.cc', 'gfx/image/image.h', 'gfx/image/image_ios.mm', @@ -90,6 +92,18 @@ 'gfx/insets.h', 'gfx/interpolated_transform.h', 'gfx/interpolated_transform.cc', + 'gfx/pango_util.h', + 'gfx/pango_util.cc', + 'gfx/platform_font.h', + 'gfx/platform_font_android.cc', + 'gfx/platform_font_ios.h', + 'gfx/platform_font_ios.mm', + 'gfx/platform_font_mac.h', + 'gfx/platform_font_mac.mm', + 'gfx/platform_font_pango.h', + 'gfx/platform_font_pango.cc', + 'gfx/platform_font_win.h', + 'gfx/platform_font_win.cc', 'gfx/point.cc', 'gfx/point.h', 'gfx/point_base.h', @@ -452,8 +466,6 @@ 'gfx/display.h', 'gfx/favicon_size.cc', 'gfx/favicon_size.h', - 'gfx/font.h', - 'gfx/font.cc', 'gfx/font_fallback_win.cc', 'gfx/font_fallback_win.h', 'gfx/font_list.h', @@ -471,24 +483,12 @@ 'gfx/mac/nsimage_cache.mm', 'gfx/mac/scoped_ns_disable_screen_updates.h', 'gfx/native_widget_types.h', - 'gfx/pango_util.h', - 'gfx/pango_util.cc', 'gfx/path.cc', 'gfx/path.h', 'gfx/path_aura.cc', 'gfx/path_gtk.cc', 'gfx/path_win.cc', 'gfx/path_win.h', - 'gfx/platform_font.h', - 'gfx/platform_font_android.cc', - 'gfx/platform_font_ios.h', - 'gfx/platform_font_ios.mm', - 'gfx/platform_font_mac.h', - 'gfx/platform_font_mac.mm', - 'gfx/platform_font_pango.h', - 'gfx/platform_font_pango.cc', - 'gfx/platform_font_win.h', - 'gfx/platform_font_win.cc', 'gfx/render_text.cc', 'gfx/render_text.h', 'gfx/render_text_mac.cc', @@ -754,6 +754,12 @@ }, }], ['OS=="ios"', { + 'sources!': [ + 'gfx/pango_util.h', + 'gfx/pango_util.cc', + 'gfx/platform_font_pango.h', + 'gfx/platform_font_pango.cc', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', |