diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:48:19 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:48:19 +0000 |
| commit | c524541f5a8ba5bb6a114685978a8fcc6cd9a8db (patch) | |
| tree | f4aae0c982d02a415ca58ff0b9c31ab5aef085a9 /skia | |
| parent | e10887cb33dccc20cb881d0ab031fc2493ca1e5f (diff) | |
| download | chromium_src-c524541f5a8ba5bb6a114685978a8fcc6cd9a8db.zip chromium_src-c524541f5a8ba5bb6a114685978a8fcc6cd9a8db.tar.gz chromium_src-c524541f5a8ba5bb6a114685978a8fcc6cd9a8db.tar.bz2 | |
Revert "Roll Skia to 3470, which changes most of the pdf includes to be private."
This reverts r128408
tbr=thakis@chromium.org
BUG=NONE
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/9835042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 3e758da..3549a92 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -383,6 +383,7 @@ '../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', @@ -467,28 +468,19 @@ '../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', @@ -525,8 +517,6 @@ '../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', @@ -670,8 +660,19 @@ '../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', @@ -745,7 +746,6 @@ '../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': [ |