chromium/src
0
Fork 0
Code Activity

Roll Skia DEPS to 12260

Browse Source 
Review URL: https://codereview.chromium.org/68343015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234689 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
robertphillips@google.com
2013-11-13 01:01:18 +00:00
parent fe3739b40a
commit 5ae98e4d2a
4 changed files with 15 additions and 6 deletions

4
DEPS

@ -44,8 +44,8 @@ vars = {
"sfntly_revision": "228",
"lighttpd_revision": "33737",
"skia_revision": "12182",
"skia_hash": "f3db546a4bf1717126a7ba4dd47ece077a6e76f7",
"skia_revision": "12260",
"skia_hash": "4d164709739ae78809125cae9b8de0f3fff0d081",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.

5
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?)$'],

5
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',

7
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', {