summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-11 13:45:33 +0000
committerdjsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-11 13:45:33 +0000
commitaf440b3593bb378469f0de7c8ae650e94e0588e6 (patch)
tree012228045b9941795a77b8aa799ef0e6b2e0f473
parentf241a2a431570ba2dde614ae696a9ce441cce60f (diff)
downloadgyp-af440b3593bb378469f0de7c8ae650e94e0588e6.tar.gz
cherrypick rev 11013 into branch m30_1599 to fix http://crbug.com/286073
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11195 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--tests.gyp1
-rw-r--r--utils.gyp2
2 files changed, 3 insertions, 0 deletions
diff --git a/tests.gyp b/tests.gyp
index f58b0ab..916f3e2 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -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',
diff --git a/utils.gyp b/utils.gyp
index 68bf6b6..df12b79 100644
--- a/utils.gyp
+++ b/utils.gyp
@@ -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,7 @@
'../src/utils/SkBitSet.h',
'../src/utils/SkBoundaryPatch.cpp',
'../src/utils/SkCamera.cpp',
+ '../src/utils/SkCanvasStateUtils.cpp',
'../src/utils/SkCubicInterval.cpp',
'../src/utils/SkCullPoints.cpp',
'../src/utils/SkDeferredCanvas.cpp',