diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 14:55:43 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 14:55:43 +0000 |
| commit | e59d759b05319b1775abf535b97bb00a3af545b5 (patch) | |
| tree | d4bf326d77d2fb092b8fb54d2578659764b05f9f /skia/skia_library.gypi | |
| parent | 46407b3537251f2392a959c4f3d5cb55dfc12c28 (diff) | |
| download | chromium_src-e59d759b05319b1775abf535b97bb00a3af545b5.zip chromium_src-e59d759b05319b1775abf535b97bb00a3af545b5.tar.gz chromium_src-e59d759b05319b1775abf535b97bb00a3af545b5.tar.bz2 | |
Revert 234496 "Roll Skia DEPS to r12231"
> Roll Skia DEPS to r12231
>
> R=rmistry@google.com
>
> Review URL: https://codereview.chromium.org/69173004
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/68203012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 46d59a8..6a741fec 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -56,9 +56,6 @@ 'skia_export_defines': [ 'SK_BUILD_FOR_ANDROID', ], - 'defines': [ - 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', - ], }], ], }, @@ -376,6 +373,9 @@ '../third_party/skia/include/utils/win', '../third_party/skia/src/utils/win', ], + 'defines': [ + 'SK_FONTHOST_USES_FONTMGR', + ], },{ # not 'OS == "win"' 'sources!': [ '../third_party/skia/src/ports/SkFontHost_win_dw.cpp', @@ -432,8 +432,6 @@ 'IGNORE_ROT_AA_RECT_OPT', - 'SK_IGNORE_BLURRED_RRECT_OPT', - 'SK_IGNORE_QUAD_RR_CORNERS_OPT', 'SKIA_IGNORE_GPU_MIPMAPS', |