Landing http://codereview.chromium.org/10179005/ for tomhudson

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133677 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -52,7 +52,7 @@ vars = {
   "ffmpeg_hash": "f8d71c394e071249f26703669baf1093009620d7",
 
   "sfntly_revision": "128",
-  "skia_revision": "3740",
+  "skia_revision": "3754",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

skia/skia.gyp

@@ -366,6 +366,7 @@
         '../third_party/skia/src/gpu/GrClipMaskManager.cpp',
         '../third_party/skia/src/gpu/GrClipMaskManager.h',
         '../third_party/skia/src/gpu/GrContext.cpp',
+        '../third_party/skia/src/gpu/GrCustomStage.cpp',
         '../third_party/skia/src/gpu/GrDefaultPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrDefaultPathRenderer.h',
         '../third_party/skia/src/gpu/GrDefaultTextContext.cpp',
@@ -427,6 +428,8 @@
         '../third_party/skia/src/gpu/gl/GrGLInterface.cpp',
         '../third_party/skia/src/gpu/gl/GrGLProgram.cpp',
         '../third_party/skia/src/gpu/gl/GrGLProgram.h',
+        '../third_party/skia/src/gpu/gl/GrGLProgramStage.cpp',
+        '../third_party/skia/src/gpu/gl/GrGLProgramStage.h',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.h',
         '../third_party/skia/src/gpu/gl/GrGLSL.cpp',
@@ -646,6 +649,7 @@
         '../third_party/skia/include/gpu/GrColor.h',
         '../third_party/skia/include/gpu/GrConfig.h',
         '../third_party/skia/include/gpu/GrContext.h',
+        '../third_party/skia/include/gpu/GrCustomStage.h',
         '../third_party/skia/include/gpu/GrFontScaler.h',
         '../third_party/skia/include/gpu/gl/GrGLConfig.h',
         '../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h',