diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 17:45:04 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 17:45:04 +0000 |
| commit | d47d8123bc6c31be9f41e13655779e7b9de0ca50 (patch) | |
| tree | 2f6f92dddf025cab26c93d57f99798b5c133f7db /skia | |
| parent | c2af05189abcb9965d0293ef84e2afc2dcfd49c4 (diff) | |
| download | chromium_src-d47d8123bc6c31be9f41e13655779e7b9de0ca50.zip chromium_src-d47d8123bc6c31be9f41e13655779e7b9de0ca50.tar.gz chromium_src-d47d8123bc6c31be9f41e13655779e7b9de0ca50.tar.bz2 | |
roll skia to 4012
Review URL: https://chromiumcodereview.appspot.com/10407062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 8cf638b..07a7c7a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -391,8 +391,6 @@ '../third_party/skia/src/gpu/GrSoftwarePathRenderer.h', '../third_party/skia/src/gpu/GrPathUtils.cpp', '../third_party/skia/src/gpu/GrPlotMgr.h', - '../third_party/skia/src/gpu/GrProgramStageFactory.cpp', - '../third_party/skia/src/gpu/GrProgramStageFactory.h', '../third_party/skia/src/gpu/GrRandom.h', '../third_party/skia/src/gpu/GrRectanizer.h', '../third_party/skia/src/gpu/GrRectanizer_fifo.cpp', @@ -535,10 +533,15 @@ #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp', '../third_party/skia/src/ports/sk_predefined_gamma.h', + '../third_party/skia/src/sfnt/SkOTUtils.cpp', + '../third_party/skia/src/sfnt/SkOTUtils.h', + '../third_party/skia/include/utils/mac/SkCGUtils.h', '../third_party/skia/include/utils/SkDeferredCanvas.h', '../third_party/skia/include/utils/SkMatrix44.h', '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp', + '../third_party/skia/src/utils/SkBase64.cpp', + '../third_party/skia/src/utils/SkBase64.h', '../third_party/skia/src/utils/SkBitSet.cpp', '../third_party/skia/src/utils/SkBitSet.h', '../third_party/skia/src/utils/SkDeferredCanvas.cpp', @@ -670,6 +673,7 @@ '../third_party/skia/include/gpu/GrNoncopyable.h', '../third_party/skia/include/gpu/GrPaint.h', '../third_party/skia/include/gpu/GrPoint.h', + '../third_party/skia/include/gpu/GrProgramStageFactory.h', '../third_party/skia/include/gpu/GrRect.h', '../third_party/skia/include/gpu/GrRefCnt.h', '../third_party/skia/include/gpu/GrRenderTarget.h', @@ -759,6 +763,7 @@ '../third_party/skia/include/utils', '../third_party/skia/src/core', '../third_party/skia/src/gpu', + '../third_party/skia/src/sfnt', '../third_party/skia/src/utils', ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], |