diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 17:58:13 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 17:58:13 +0000 |
| commit | 7fcd129ae9b69b13bbcf57161c28c693628f6a6d (patch) | |
| tree | d2538e81a3da397dee0ed7c15ed3a18c2473edaa | |
| parent | 31f4fcc0004c97d25295d645e5884405a2d9d222 (diff) | |
| download | chromium_src-7fcd129ae9b69b13bbcf57161c28c693628f6a6d.zip chromium_src-7fcd129ae9b69b13bbcf57161c28c693628f6a6d.tar.gz chromium_src-7fcd129ae9b69b13bbcf57161c28c693628f6a6d.tar.bz2 | |
Roll Skia DEPS to 5042 & skia.gyp changes
control: http://codereview.chromium.org/10824254/
Review URL: https://chromiumcodereview.appspot.com/10825298
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151082 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888", "sfntly_revision": "134", - "skia_revision": "5029", + "skia_revision": "5042", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/skia.gyp b/skia/skia.gyp index 84a57f8..e8d5a7f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -201,6 +201,7 @@ '../third_party/skia/src/core/SkBlitRow_D32.cpp', '../third_party/skia/src/core/SkBlitRow_D4444.cpp', '../third_party/skia/src/core/SkBlitter.cpp', + '../third_party/skia/src/core/SkBlitter.h', '../third_party/skia/src/core/SkBlitter_4444.cpp', '../third_party/skia/src/core/SkBlitter_A1.cpp', '../third_party/skia/src/core/SkBlitter_A8.cpp', @@ -297,13 +298,13 @@ '../third_party/skia/src/core/SkScalar.cpp', '../third_party/skia/src/core/SkScalerContext.cpp', '../third_party/skia/src/core/SkScan.cpp', + '../third_party/skia/src/core/SkScan.h', '../third_party/skia/src/core/SkScanPriv.h', '../third_party/skia/src/core/SkScan_AntiPath.cpp', '../third_party/skia/src/core/SkScan_Antihair.cpp', '../third_party/skia/src/core/SkScan_Hairline.cpp', '../third_party/skia/src/core/SkScan_Path.cpp', '../third_party/skia/src/core/SkShader.cpp', - '../third_party/skia/src/core/SkShape.cpp', '../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp', '../third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp', '../third_party/skia/src/core/SkSinTable.h', @@ -600,7 +601,6 @@ '../third_party/skia/include/core/SkAnnotation.h', '../third_party/skia/include/core/SkBitmap.h', '../third_party/skia/include/core/SkBlitRow.h', - '../third_party/skia/include/core/SkBlitter.h', '../third_party/skia/include/core/SkBounder.h', '../third_party/skia/include/core/SkBuffer.h', '../third_party/skia/include/core/SkCanvas.h', @@ -656,7 +656,6 @@ '../third_party/skia/include/core/SkScalar.h', '../third_party/skia/include/core/SkScalarCompare.h', '../third_party/skia/include/core/SkScalerContext.h', - '../third_party/skia/include/core/SkScan.h', '../third_party/skia/include/core/SkShader.h', '../third_party/skia/include/core/SkStream.h', '../third_party/skia/include/core/SkString.h', |