diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-02 13:44:49 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-02 13:44:49 +0000 |
| commit | 16ac00980fbf8d138fd0eb2370d94c5af4f83535 (patch) | |
| tree | 42c3b3980705aeba297bad35967de9278614c8af | |
| parent | 0527dc6e1625a25ebfd13de360fceccae2592065 (diff) | |
| parent | 581a4bdf9c3c227df195a019a899bf9fd662b265 (diff) | |
| download | gyp-16ac00980fbf8d138fd0eb2370d94c5af4f83535.tar.gz | |
Merge from Chromium at DEPS revision 241094
This commit was generated by merge_to_master.py.
Change-Id: I23adcdd642190f7b78ab024a392a1a8bec6c6f5c
| -rw-r--r-- | effects.gypi | 1 | ||||
| -rw-r--r-- | gmslides.gypi | 1 | ||||
| -rw-r--r-- | tests.gyp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/effects.gypi b/effects.gypi index 845dd94..214cfdd 100644 --- a/effects.gypi +++ b/effects.gypi @@ -48,6 +48,7 @@ '<(skia_src_path)/effects/SkOffsetImageFilter.cpp', '<(skia_src_path)/effects/SkPaintFlagsDrawFilter.cpp', '<(skia_src_path)/effects/SkPerlinNoiseShader.cpp', + '<(skia_src_path)/effects/SkPictureImageFilter.cpp', '<(skia_src_path)/effects/SkPixelXorXfermode.cpp', '<(skia_src_path)/effects/SkPorterDuff.cpp', '<(skia_src_path)/effects/SkRectShaderImageFilter.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index e29a702..bcbee29 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -105,6 +105,7 @@ '../gm/pathopsskpclip.cpp', '../gm/pathreverse.cpp', '../gm/perlinnoise.cpp', + '../gm/pictureimagefilter.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', '../gm/polygons.cpp', @@ -32,6 +32,7 @@ '../tests/AnnotationTest.cpp', '../tests/ARGBImageEncoderTest.cpp', '../tests/AtomicTest.cpp', + '../tests/BitmapTest.cpp', '../tests/BitmapCopyTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitmapHasherTest.cpp', |