summaryrefslogtreecommitdiffstats
path: root/skia/skia_library.gypi
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 01:01:18 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 01:01:18 +0000
commit5ae98e4d2ab3aa6294584350696b914d12dc26df (patch)
treecd34abfcd96fa823db80b779643d8b1739e5ab31 /skia/skia_library.gypi
parentfe3739b40a75320ffe0e77aa85d57d5b700e2f73 (diff)
downloadchromium_src-5ae98e4d2ab3aa6294584350696b914d12dc26df.zip
chromium_src-5ae98e4d2ab3aa6294584350696b914d12dc26df.tar.gz
chromium_src-5ae98e4d2ab3aa6294584350696b914d12dc26df.tar.bz2
Roll Skia DEPS to 12260
Review URL: https://codereview.chromium.org/68343015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
-rw-r--r--skia/skia_library.gypi5
1 files changed, 2 insertions, 3 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index 6a741fec..34a4f3d 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -373,9 +373,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 +429,8 @@
'IGNORE_ROT_AA_RECT_OPT',
+ 'SK_IGNORE_BLURRED_RRECT_OPT',
+
'SK_IGNORE_QUAD_RR_CORNERS_OPT',
'SKIA_IGNORE_GPU_MIPMAPS',