Roll Skia DEPS to 5003 & skia.gyp changes

Control: http://codereview.chromium.org/10830214/
Review URL: https://chromiumcodereview.appspot.com/10828207

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150554 0039d316-1c4b-4281-b951-d872f2087c98
parent 5039aa43
...@@ -29,7 +29,7 @@ vars = { ...@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888", "ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888",
"sfntly_revision": "134", "sfntly_revision": "134",
"skia_revision": "4991", "skia_revision": "5003",
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia # the commit queue can handle CLs rolling Skia
# and V8 without interference from each other. # and V8 without interference from each other.
......
...@@ -179,7 +179,9 @@ ...@@ -179,7 +179,9 @@
'../third_party/skia/src/core/SkAnnotation.cpp', '../third_party/skia/src/core/SkAnnotation.cpp',
'../third_party/skia/src/core/SkAlphaRuns.cpp', '../third_party/skia/src/core/SkAlphaRuns.cpp',
'../third_party/skia/src/core/SkAntiRun.h', '../third_party/skia/src/core/SkAntiRun.h',
'../third_party/skia/src/core/SkAutoKern.h',
'../third_party/skia/src/core/SkBitmap.cpp', '../third_party/skia/src/core/SkBitmap.cpp',
'../third_party/skia/src/core/SkBitmapHeap.cpp',
'../third_party/skia/src/core/SkBitmapProcShader.cpp', '../third_party/skia/src/core/SkBitmapProcShader.cpp',
'../third_party/skia/src/core/SkBitmapProcShader.h', '../third_party/skia/src/core/SkBitmapProcShader.h',
'../third_party/skia/src/core/SkBitmapProcState.cpp', '../third_party/skia/src/core/SkBitmapProcState.cpp',
...@@ -235,6 +237,7 @@ ...@@ -235,6 +237,7 @@
'../third_party/skia/src/core/SkEdgeClipper.cpp', '../third_party/skia/src/core/SkEdgeClipper.cpp',
'../third_party/skia/src/core/SkEdge.cpp', '../third_party/skia/src/core/SkEdge.cpp',
'../third_party/skia/src/core/SkEdge.h', '../third_party/skia/src/core/SkEdge.h',
'../third_party/skia/src/core/SkFDot6.h',
'../third_party/skia/src/core/SkFP.h', '../third_party/skia/src/core/SkFP.h',
'../third_party/skia/src/core/SkFilterProc.cpp', '../third_party/skia/src/core/SkFilterProc.cpp',
'../third_party/skia/src/core/SkFilterProc.h', '../third_party/skia/src/core/SkFilterProc.h',
...@@ -383,6 +386,7 @@ ...@@ -383,6 +386,7 @@
'../third_party/skia/src/gpu/GrBinHashKey.h', '../third_party/skia/src/gpu/GrBinHashKey.h',
'../third_party/skia/src/gpu/GrBufferAllocPool.cpp', '../third_party/skia/src/gpu/GrBufferAllocPool.cpp',
'../third_party/skia/src/gpu/GrBufferAllocPool.h', '../third_party/skia/src/gpu/GrBufferAllocPool.h',
'../third_party/skia/src/gpu/GrCacheID.cpp',
'../third_party/skia/src/gpu/GrClipData.cpp', '../third_party/skia/src/gpu/GrClipData.cpp',
'../third_party/skia/src/gpu/GrClipMaskManager.cpp', '../third_party/skia/src/gpu/GrClipMaskManager.cpp',
'../third_party/skia/src/gpu/GrClipMaskManager.h', '../third_party/skia/src/gpu/GrClipMaskManager.h',
...@@ -593,7 +597,6 @@ ...@@ -593,7 +597,6 @@
'../third_party/skia/include/core/Sk64.h', '../third_party/skia/include/core/Sk64.h',
'../third_party/skia/include/core/SkAdvancedTypefaceMetrics.h', '../third_party/skia/include/core/SkAdvancedTypefaceMetrics.h',
'../third_party/skia/include/core/SkAnnotation.h', '../third_party/skia/include/core/SkAnnotation.h',
'../third_party/skia/include/core/SkAutoKern.h',
'../third_party/skia/include/core/SkBitmap.h', '../third_party/skia/include/core/SkBitmap.h',
'../third_party/skia/include/core/SkBlitRow.h', '../third_party/skia/include/core/SkBlitRow.h',
'../third_party/skia/include/core/SkBlitter.h', '../third_party/skia/include/core/SkBlitter.h',
...@@ -617,7 +620,6 @@ ...@@ -617,7 +620,6 @@
'../third_party/skia/include/core/SkDrawLooper.h', '../third_party/skia/include/core/SkDrawLooper.h',
#'../third_party/skia/include/core/SkDrawing.h', #'../third_party/skia/include/core/SkDrawing.h',
'../third_party/skia/include/core/SkEndian.h', '../third_party/skia/include/core/SkEndian.h',
'../third_party/skia/include/core/SkFDot6.h',
'../third_party/skia/include/core/SkFixed.h', '../third_party/skia/include/core/SkFixed.h',
'../third_party/skia/include/core/SkFlate.h', '../third_party/skia/include/core/SkFlate.h',
'../third_party/skia/include/core/SkFlattenable.h', '../third_party/skia/include/core/SkFlattenable.h',
...@@ -702,6 +704,7 @@ ...@@ -702,6 +704,7 @@
'../third_party/skia/include/effects/SkTransparentShader.h', '../third_party/skia/include/effects/SkTransparentShader.h',
'../third_party/skia/include/gpu/GrAARectRenderer.h', '../third_party/skia/include/gpu/GrAARectRenderer.h',
'../third_party/skia/include/gpu/GrCacheID.h',
'../third_party/skia/include/gpu/GrClipData.h', '../third_party/skia/include/gpu/GrClipData.h',
'../third_party/skia/include/gpu/GrColor.h', '../third_party/skia/include/gpu/GrColor.h',
'../third_party/skia/include/gpu/GrConfig.h', '../third_party/skia/include/gpu/GrConfig.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment