Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 5afe400f473c747e2e5acb50b249fad1b8f2b0fc

This commit was generated by merge_from_chromium.py.

Change-Id: Ia18ffef2aceadb367de401336963c16cfdd1345b

4 files changed, 139 insertions, 4 deletions

diff --git a/core.gypi b/core.gypi
index 5c3fdf5..d3d998e 100644
--- a/core.gypi
+++ b/core.gypi
@@ -87,6 +87,7 @@
         '<(skia_src_path)/core/SkFilterShader.cpp',
         '<(skia_src_path)/core/SkFlattenable.cpp',
         '<(skia_src_path)/core/SkFlattenableBuffers.cpp',
+        '<(skia_src_path)/core/SkFlattenableSerialization.cpp',
         '<(skia_src_path)/core/SkFloat.cpp',
         '<(skia_src_path)/core/SkFloat.h',
         '<(skia_src_path)/core/SkFloatBits.cpp',
@@ -235,6 +236,7 @@
         '<(skia_include_path)/core/SkError.h',
         '<(skia_include_path)/core/SkFixed.h',
         '<(skia_include_path)/core/SkFlattenable.h',
+        '<(skia_include_path)/core/SkFlattenableSerialization.h',
         '<(skia_include_path)/core/SkFloatBits.h',
         '<(skia_include_path)/core/SkFloatingPoint.h',
         '<(skia_include_path)/core/SkFontHost.h',
diff --git a/exported_api_headers.gypi b/exported_api_headers.gypi
new file mode 100644
index 0000000..a105a8a
--- /dev/null
+++ b/exported_api_headers.gypi
@@ -0,0 +1,133 @@
+# Include this gypi to include all public header files that use
+# the SK_API defines.
+#
+# The list is computed by running 'egrep -lr "SK_API" include' in the root dir 
+# of the project.
+#
+{
+  'variables': {
+    'header_filenames': [
+      'pdf/SkPDFDevice.h',
+      'pdf/SkPDFDocument.h',
+      'gpu/SkGpuDevice.h',
+      'gpu/SkGrPixelRef.h',
+      'effects/SkMorphologyImageFilter.h',
+      'effects/Sk2DPathEffect.h',
+      'effects/SkXfermodeImageFilter.h',
+      'effects/SkArithmeticMode.h',
+      'effects/SkMergeImageFilter.h',
+      'effects/SkPerlinNoiseShader.h',
+      'effects/SkLerpXfermode.h',
+      'effects/SkRectShaderImageFilter.h',
+      'effects/SkMagnifierImageFilter.h',
+      'effects/SkBicubicImageFilter.h',
+      'effects/SkPorterDuff.h',
+      'effects/SkBlurImageFilter.h',
+      'effects/SkKernel33MaskFilter.h',
+      'effects/SkTableMaskFilter.h',
+      'effects/SkAvoidXfermode.h',
+      'effects/SkBitmapSource.h',
+      'effects/SkCornerPathEffect.h',
+      'effects/SkTransparentShader.h',
+      'effects/SkStippleMaskFilter.h',
+      'effects/SkPaintFlagsDrawFilter.h',
+      'effects/SkOffsetImageFilter.h',
+      'effects/SkDiscretePathEffect.h',
+      'effects/SkTableColorFilter.h',
+      'effects/SkGradientShader.h',
+      'effects/SkEmbossMaskFilter.h',
+      'effects/SkComposeImageFilter.h',
+      'effects/SkTestImageFilters.h',
+      'effects/SkLayerRasterizer.h',
+      'effects/SkDashPathEffect.h',
+      'effects/Sk1DPathEffect.h',
+      'effects/SkBlurMaskFilter.h',
+      'effects/SkDisplacementMapEffect.h',
+      'effects/SkPixelXorXfermode.h',
+      'effects/SkColorMatrixFilter.h',
+      'effects/SkColorMatrix.h',
+      'effects/SkBlurDrawLooper.h',
+      'effects/SkColorFilterImageFilter.h',
+      'effects/SkLayerDrawLooper.h',
+      'effects/SkLightingImageFilter.h',
+      'effects/SkDropShadowImageFilter.h',
+      'effects/SkMatrixConvolutionImageFilter.h',
+      'utils/SkPictureUtils.h',
+      'utils/SkMatrix44.h',
+      'utils/SkProxyCanvas.h',
+      'utils/SkNWayCanvas.h',
+      'utils/SkPathUtils.h',
+      'utils/SkDeferredCanvas.h',
+      'utils/SkNullCanvas.h',
+      'utils/mac/SkCGUtils.h',
+      'device/xps/SkXPSDevice.h',
+      'ports/SkTypeface_win.h',
+      'ports/SkFontConfigInterface.h',
+      'ports/SkTypeface_mac.h',
+      'ports/SkTypeface_android.h',
+      'ports/SkFontStyle.h',
+      'ports/SkFontMgr.h',
+      'core/SkColor.h',
+      'core/SkFontHost.h',
+      'core/SkMetaData.h',
+      'core/SkRRect.h',
+      'core/SkMatrix.h',
+      'core/SkDataTable.h',
+      'core/SkTypeface.h',
+      'core/SkDrawFilter.h',
+      'core/SkRasterizer.h',
+      'core/SkColorPriv.h',
+      'core/SkPaint.h',
+      'core/SkBitmap.h',
+      'core/SkFloatBits.h',
+      'core/SkDeque.h',
+      'core/Sk64.h',
+      'core/SkComposeShader.h',
+      'core/SkImage.h',
+      'core/SkTileGridPicture.h',
+      'core/SkGraphics.h',
+      'core/SkCanvas.h',
+      'core/SkPicture.h',
+      'core/SkClipStack.h',
+      'core/SkXfermode.h',
+      'core/SkColorFilter.h',
+      'core/SkRegion.h',
+      'core/SkRefCnt.h',
+      'core/SkStream.h',
+      'core/SkGeometry.h',
+      'core/SkPathMeasure.h',
+      'core/SkMaskFilter.h',
+      'core/SkTDArray.h',
+      'core/SkAnnotation.h',
+      'core/SkDrawLooper.h',
+      'core/SkThread_platform.h',
+      'core/SkTemplates.h',
+      'core/SkWeakRefCnt.h',
+      'core/SkTypes.h',
+      'core/SkData.h',
+      'core/SkPoint.h',
+      'core/SkColorShader.h',
+      'core/SkUnPreMultiply.h',
+      'core/SkDevice.h',
+      'core/SkImageFilter.h',
+      'core/SkPreConfig.h',
+      'core/SkImageFilterUtils.h',
+      'core/SkPathEffect.h',
+      'core/SkString.h',
+      'core/SkPixelRef.h',
+      'core/SkEmptyShader.h',
+      'core/SkSurface.h',
+      'core/SkShader.h',
+      'core/SkPath.h',
+      'core/SkFlattenable.h',
+      'core/SkRect.h',
+      'pathops/SkPathOps.h',
+    ],
+  },
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gmslides.gypi b/gmslides.gypi
index 8d0b2e9..87c46e7 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -20,6 +20,7 @@
     '../gm/blurquickreject.cpp',
     '../gm/blurrect.cpp',
     '../gm/circles.cpp',
+    '../gm/circularclips.cpp',
     '../gm/colorfilterimagefilter.cpp',
     '../gm/colormatrix.cpp',
     '../gm/colortype.cpp',
@@ -126,6 +127,7 @@
     '../gm/xfermodeimagefilter.cpp',
     '../gm/xfermodes.cpp',
     '../gm/xfermodes2.cpp',
+    '../gm/xfermodes3.cpp',
   ],
 }
 
diff --git a/pdfviewer.gyp b/pdfviewer.gyp
index 063c294..4f6e8ab 100644
--- a/pdfviewer.gyp
+++ b/pdfviewer.gyp
@@ -72,9 +72,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/native/autogen',
       ],
       'dependencies': [
-        'core.gyp:core',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
         'zlib.gyp:zlib',
       ],
     },
@@ -96,7 +94,7 @@
         '../experimental/PdfViewer/pdfparser/native/autogen',
       ],
       'dependencies': [
-        'core.gyp:core',
+        'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
         'libpdfviewer',
         'chop_transparency',