diff options
| author | epoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 17:50:19 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 17:50:19 +0000 |
| commit | 0a4392ad9520c4faccc35246eeb8e3707bb621b9 (patch) | |
| tree | 40f51eba5312d7049f9072d8c737226308bb27cd /skia | |
| parent | 50e8558c98572f9bd6b6be5cf0a93e4a8d976057 (diff) | |
| download | chromium_src-0a4392ad9520c4faccc35246eeb8e3707bb621b9.zip chromium_src-0a4392ad9520c4faccc35246eeb8e3707bb621b9.tar.gz chromium_src-0a4392ad9520c4faccc35246eeb8e3707bb621b9.tar.bz2 | |
Roll Skia DEPS to 3470
Review URL: https://chromiumcodereview.appspot.com/9834048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 3549a92..2171db6 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -383,7 +383,6 @@ '../third_party/skia/src/gpu/GrPathRendererChain.h', '../third_party/skia/src/gpu/GrPathUtils.cpp', '../third_party/skia/src/gpu/GrPlotMgr.h', - '../third_party/skia/src/gpu/GrPrintf_skia.cpp', '../third_party/skia/src/gpu/GrRandom.h', '../third_party/skia/src/gpu/GrRectanizer.h', '../third_party/skia/src/gpu/GrRectanizer_fifo.cpp', @@ -468,19 +467,28 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp', - '../third_party/skia/src/pdf/SkBitSet.cpp', '../third_party/skia/src/pdf/SkPDFCatalog.cpp', + '../third_party/skia/src/pdf/SkPDFCatalog.h', '../third_party/skia/src/pdf/SkPDFDevice.cpp', '../third_party/skia/src/pdf/SkPDFDocument.cpp', '../third_party/skia/src/pdf/SkPDFFont.cpp', + '../third_party/skia/src/pdf/SkPDFFont.h', '../third_party/skia/src/pdf/SkPDFFormXObject.cpp', + '../third_party/skia/src/pdf/SkPDFFormXObject.h', '../third_party/skia/src/pdf/SkPDFGraphicState.cpp', + '../third_party/skia/src/pdf/SkPDFGraphicState.h', '../third_party/skia/src/pdf/SkPDFImage.cpp', + '../third_party/skia/src/pdf/SkPDFImage.h', '../third_party/skia/src/pdf/SkPDFPage.cpp', + '../third_party/skia/src/pdf/SkPDFPage.h', '../third_party/skia/src/pdf/SkPDFShader.cpp', + '../third_party/skia/src/pdf/SkPDFShader.h', '../third_party/skia/src/pdf/SkPDFStream.cpp', + '../third_party/skia/src/pdf/SkPDFStream.h', '../third_party/skia/src/pdf/SkPDFTypes.cpp', + '../third_party/skia/src/pdf/SkPDFTypes.h', '../third_party/skia/src/pdf/SkPDFUtils.cpp', + '../third_party/skia/src/pdf/SkPDFUtils.h', '../third_party/skia/src/ports/FontHostConfiguration_android.cpp', #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp', @@ -517,6 +525,8 @@ '../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/SkBitSet.cpp', + '../third_party/skia/src/utils/SkBitSet.h', '../third_party/skia/src/utils/SkDeferredCanvas.cpp', '../third_party/skia/src/utils/SkMatrix44.cpp', @@ -660,19 +670,8 @@ '../third_party/skia/include/gpu/SkGr.h', '../third_party/skia/include/gpu/SkGrTexturePixelRef.h', - '../third_party/skia/include/pdf/SkBitSet.h', - '../third_party/skia/include/pdf/SkPDFCatalog.h', '../third_party/skia/include/pdf/SkPDFDevice.h', '../third_party/skia/include/pdf/SkPDFDocument.h', - '../third_party/skia/include/pdf/SkPDFFont.h', - '../third_party/skia/include/pdf/SkPDFFormXObject.h', - '../third_party/skia/include/pdf/SkPDFGraphicState.h', - '../third_party/skia/include/pdf/SkPDFImage.h', - '../third_party/skia/include/pdf/SkPDFPage.h', - '../third_party/skia/include/pdf/SkPDFShader.h', - '../third_party/skia/include/pdf/SkPDFStream.h', - '../third_party/skia/include/pdf/SkPDFTypes.h', - '../third_party/skia/include/pdf/SkPDFUtils.h', '../third_party/skia/include/ports/SkStream_Win.h', '../third_party/skia/include/ports/SkTypeface_win.h', @@ -746,6 +745,7 @@ '../third_party/skia/include/ports', '../third_party/skia/include/utils', '../third_party/skia/src/core', + '../third_party/skia/src/utils', ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 'mac_framework_dirs': [ @@ -903,7 +903,6 @@ ], 'sources!': [ 'ext/vector_platform_device_skia.cc', - '../third_party/skia/src/core/SkTypefaceCache.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', ], 'export_dependent_settings': [ |