diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 10:18:28 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 10:18:28 +0100 |
| commit | 8ead1f84df99b2e811fb5e1cf5d2fca9ae3ac934 (patch) | |
| tree | 8addae5c911b3257bcf4d32b878e1f2a0a9d0597 | |
| parent | f32c414516d0196f6a2eb34809e16f670506f745 (diff) | |
| parent | 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87 (diff) | |
| download | gyp-8ead1f84df99b2e811fb5e1cf5d2fca9ae3ac934.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/a/external/skia/gyp.git at 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87
This commit was generated by merge_from_chromium.py.
Change-Id: Ib74a51559d43fa36e2d96babb69fe4cb3653e71d
| -rw-r--r-- | tests.gyp | 1 | ||||
| -rw-r--r-- | utils.gyp | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -34,6 +34,7 @@ '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', + '../tests/CanvasStateTest.cpp', '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', @@ -35,6 +35,7 @@ '../include/utils/SkBoundaryPatch.h', '../include/utils/SkCamera.h', + '../include/utils/SkCanvasStateUtils.h', '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', '../include/utils/SkDebugUtils.h', @@ -65,6 +66,9 @@ '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkCanvasStack.h', + '../src/utils/SkCanvasStack.cpp', + '../src/utils/SkCanvasStateUtils.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', |