From af440b3593bb378469f0de7c8ae650e94e0588e6 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 11 Sep 2013 13:45:33 +0000 Subject: 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 --- tests.gyp | 1 + utils.gyp | 2 ++ 2 files changed, 3 insertions(+) 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', -- cgit v1.2.3 From 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 11 Sep 2013 13:50:53 +0000 Subject: cherrypick rev 11081 into branch m30_1599 to fix http://crbug.com/286073 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11196 2bbb7eff-a529-9590-31e7-b0007b416f81 --- utils.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils.gyp b/utils.gyp index df12b79..d3bac16 100644 --- a/utils.gyp +++ b/utils.gyp @@ -66,6 +66,8 @@ '../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', -- cgit v1.2.3