Commit 6248b94b authored by bensong@google.com's avatar bensong@google.com

roll skia DEPS to 14128

Chromium base revision: 262955 / 
Old Skia revision: 14102 
New Skia revision: 14128
Control CL: https://codereview.chromium.org/233193002/

Bypassing commit queue trybots: 
NOTRY=true

Review URL: https://codereview.chromium.org/232783004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263093 0039d316-1c4b-4281-b951-d872f2087c98
parent 92abd732
...@@ -45,8 +45,8 @@ vars = { ...@@ -45,8 +45,8 @@ vars = {
"sfntly_revision": "228", "sfntly_revision": "228",
"lighttpd_revision": "33737", "lighttpd_revision": "33737",
"skia_revision": "14102", "skia_revision": "14128",
"skia_hash": "e1d94437585dad1c195d7cf095f8a5a8219d196a", "skia_hash": "729296f7db5edacf17ee33a10f92ccc476274590",
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia # the commit queue can handle CLs rolling Skia
# and V8 without interference from each other. # and V8 without interference from each other.
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp', '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
...@@ -143,15 +143,20 @@ ...@@ -143,15 +143,20 @@
], ],
}], }],
[ 'target_arch == "arm64"',{ [ 'target_arch == "arm64"',{
# TODO(rmcilroy): Update this once http://crrev.com/143423004/ lands.
'sources': [ 'sources': [
'../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
'../third_party/skia/src/opts/SkBlitMask_opts_none.cpp', '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
'../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
'../third_party/skia/src/opts/SkUtils_opts_none.cpp', '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_none.cpp', '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
'../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
], ],
}], }],
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment