Merge from Chromium at DEPS revision 30.0.1599.39android-4.4_r0.8android-4.4_r0.7

This commit was generated by merge_to_master.py.

Change-Id: I2b887907447928b7249a5e19409d8672d4dd123e

2 files changed, 5 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..d3bac16 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,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',