Revert "Roll Skia to 3470, which changes most of the pdf includes to be private."

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 365 matching lines @@
         '../third_party/skia/src/gpu/GrInOrderDrawBuffer.h',
         '../third_party/skia/src/gpu/GrIndexBuffer.h',
         '../third_party/skia/src/gpu/GrMatrix.cpp',
         '../third_party/skia/src/gpu/GrMemory.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.h',
         '../third_party/skia/src/gpu/GrPathRendererChain.cpp',
         '../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',
         '../third_party/skia/src/gpu/GrRenderTarget.cpp',
         '../third_party/skia/src/gpu/GrResource.cpp',
         '../third_party/skia/src/gpu/GrResourceCache.cpp',
         '../third_party/skia/src/gpu/GrResourceCache.h',
         '../third_party/skia/src/gpu/GrStencil.cpp',
         '../third_party/skia/src/gpu/GrStencil.h',
         '../third_party/skia/src/gpu/GrStencilBuffer.cpp',
@@ skipping 64 matching lines @@
         #'../third_party/skia/src/images/SkImageRefPool.cpp',
         #'../third_party/skia/src/images/SkImageRefPool.h',
         #'../third_party/skia/src/images/SkImageRef_GlobalPool.cpp',
         #'../third_party/skia/src/images/SkMovie.cpp',
         #'../third_party/skia/src/images/SkMovie_gif.cpp',
         '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
         '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
         '../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',
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
         '../third_party/skia/src/ports/SkFontHost_android.cpp',
         #'../third_party/skia/src/ports/SkFontHost_ascender.cpp',
         '../third_party/skia/src/ports/SkFontHost_tables.cpp',
         '../third_party/skia/src/ports/SkFontHost_gamma.cpp',
         '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
         #'../third_party/skia/src/ports/SkFontHost_linux.cpp',
@@ skipping 16 matching lines @@
         #'../third_party/skia/src/ports/SkXMLParser_empty.cpp',
         #'../third_party/skia/src/ports/SkXMLParser_expat.cpp',
         #'../third_party/skia/src/ports/SkXMLParser_tinyxml.cpp',
         #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp',
         '../third_party/skia/src/ports/sk_predefined_gamma.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/SkBitSet.cpp',
-        '../third_party/skia/src/utils/SkBitSet.h',
         '../third_party/skia/src/utils/SkDeferredCanvas.cpp',
         '../third_party/skia/src/utils/SkMatrix44.cpp',
 
         '../third_party/skia/include/core/Sk64.h',
         '../third_party/skia/include/core/SkAdvancedTypefaceMetrics.h',
         '../third_party/skia/include/core/SkAutoKern.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',
@@ skipping 123 matching lines @@
         '../third_party/skia/include/gpu/GrScalar.h',
         '../third_party/skia/include/gpu/GrTextContext.h',
         '../third_party/skia/include/gpu/GrTexture.h',
         '../third_party/skia/include/gpu/GrTypes.h',
         '../third_party/skia/include/gpu/GrUserConfig.h',
         '../third_party/skia/include/gpu/SkGpuCanvas.h',
         '../third_party/skia/include/gpu/SkGpuDevice.h',
         '../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',
 
         '../third_party/skia/include/images/SkFlipPixelRef.h',
         '../third_party/skia/include/images/SkImageDecoder.h',
         '../third_party/skia/include/images/SkImageEncoder.h',
         '../third_party/skia/include/images/SkImageRef.h',
         '../third_party/skia/include/images/SkImageRef_GlobalPool.h',
         '../third_party/skia/include/images/SkMovie.h',
@@ skipping 53 matching lines @@
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
         '../third_party/skia/include/gpu',
         '../third_party/skia/include/gpu/gl',
         '../third_party/skia/include/images',
         '../third_party/skia/include/pdf',
         '../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': [
         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
       ],
       'defines': [
         'SK_BUILD_NO_IMAGE_ENCODE',
         'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_STATIC_RECT_VB=1',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
@@ skipping 491 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }