diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 17:05:24 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 17:05:24 +0000 |
| commit | 0b8a4bb8ddbad72d5d368777b81e58670006e0f7 (patch) | |
| tree | c6b162e87c74868f167bc65ba265eeac2499123e | |
| parent | 42d04060238a84c44ed01a5b20150ffd98f32880 (diff) | |
| download | chromium_src-0b8a4bb8ddbad72d5d368777b81e58670006e0f7.zip chromium_src-0b8a4bb8ddbad72d5d368777b81e58670006e0f7.tar.gz chromium_src-0b8a4bb8ddbad72d5d368777b81e58670006e0f7.tar.bz2 | |
Roll Skia DEPS to 5029 & skia.gyp changes
control: http://codereview.chromium.org/10836175/
Review URL: https://chromiumcodereview.appspot.com/10832223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150822 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888", "sfntly_revision": "134", - "skia_revision": "5003", + "skia_revision": "5029", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/skia.gyp b/skia/skia.gyp index 818d757..035f4df 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -272,6 +272,7 @@ '../third_party/skia/src/core/SkPathHeap.cpp', '../third_party/skia/src/core/SkPathHeap.h', '../third_party/skia/src/core/SkPathMeasure.cpp', + '../third_party/skia/src/core/SkPerspIter.h', '../third_party/skia/src/core/SkPicture.cpp', '../third_party/skia/src/core/SkPictureFlat.cpp', '../third_party/skia/src/core/SkPictureFlat.h', @@ -641,7 +642,6 @@ '../third_party/skia/include/core/SkPath.h', '../third_party/skia/include/core/SkPathEffect.h', '../third_party/skia/include/core/SkPathMeasure.h', - '../third_party/skia/include/core/SkPerspIter.h', '../third_party/skia/include/core/SkPicture.h', '../third_party/skia/include/core/SkPixelRef.h', '../third_party/skia/include/core/SkPoint.h', @@ -1252,6 +1252,7 @@ 'sources': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', + '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', '../third_party/skia/src/opts/opts_check_arm.cpp', ], }], @@ -1264,9 +1265,11 @@ 'sources': [ '../third_party/skia/src/opts/memset16_neon.S', '../third_party/skia/src/opts/memset32_neon.S', + '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp', '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h', + '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp', ], }], [ 'target_arch == "arm" and armv7 != 1', { |