diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 01:01:18 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 01:01:18 +0000 |
| commit | 5ae98e4d2ab3aa6294584350696b914d12dc26df (patch) | |
| tree | cd34abfcd96fa823db80b779643d8b1739e5ab31 /skia | |
| parent | fe3739b40a75320ffe0e77aa85d57d5b700e2f73 (diff) | |
| download | chromium_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')
| -rw-r--r-- | skia/skia_common.gypi | 5 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 5 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 628c474..af77047 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -16,6 +16,11 @@ ['exclude', '_android\\.(cc|cpp)$'], ], }], + [ 'OS == "android"', { + 'defines': [ + 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', + ], + }], [ 'OS != "ios"', { 'sources/': [ ['exclude', '_ios\\.(cc|cpp|mm?)$'], 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', diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 6c682b4..888fdc0 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -51,6 +51,7 @@ '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp', ], 'dependencies': [ 'skia_opts_ssse3', @@ -109,6 +110,7 @@ '../third_party/skia/src/opts/SkUtils_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkMorphology_opts_none.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }], [ 'target_arch == "arm" and arm_version >= 6', { @@ -118,7 +120,7 @@ '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', '../third_party/skia/src/opts/opts_check_arm.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', - '../third_party/skia/src/opts/SkMorphology_opts_none.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }], [ 'target_arch == "mipsel"',{ @@ -132,6 +134,7 @@ '../third_party/skia/src/opts/SkUtils_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkMorphology_opts_none.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }], ], @@ -195,6 +198,7 @@ '../third_party/skia/src/opts/SkUtils_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkMorphology_opts_none.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }, ], @@ -239,6 +243,7 @@ '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h', '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp', '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp', + '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp', ], 'conditions': [ ['arm_neon == 1', { |