diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 13:38:51 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 13:38:51 +0000 |
| commit | 60387a70fd6d87f4a42d2eb12b5b093de701378f (patch) | |
| tree | c09be4d9d06d1b49e19836ffa286e04f449f1872 /skia/skia_library.gypi | |
| parent | e3a46c6babaf4f26a5ab606cd2eea735ae06ae93 (diff) | |
| download | chromium_src-60387a70fd6d87f4a42d2eb12b5b093de701378f.zip chromium_src-60387a70fd6d87f4a42d2eb12b5b093de701378f.tar.gz chromium_src-60387a70fd6d87f4a42d2eb12b5b093de701378f.tar.bz2 | |
Roll Skia DEPS to r12231
R=rmistry@google.com
Review URL: https://codereview.chromium.org/69173004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 6a741fec..46d59a8 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -56,6 +56,9 @@ 'skia_export_defines': [ 'SK_BUILD_FOR_ANDROID', ], + 'defines': [ + 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', + ], }], ], }, @@ -373,9 +376,6 @@ '../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,6 +432,8 @@ 'IGNORE_ROT_AA_RECT_OPT', + 'SK_IGNORE_BLURRED_RRECT_OPT', + 'SK_IGNORE_QUAD_RR_CORNERS_OPT', 'SKIA_IGNORE_GPU_MIPMAPS', |