Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I96bb9d31020fd7aa85ea0dbb6b95dd7c68b91dae

5 files changed, 76 insertions, 35 deletions

diff --git a/core.gyp b/core.gyp
index 14eda4b..7d322a6 100644
--- a/core.gyp
+++ b/core.gyp
@@ -79,11 +79,13 @@
           'sources': [
             '../src/core/SkPaintOptionsAndroid.cpp',
           ],
+          'dependencies': [
+            'android_deps.gyp:cpu_features',
+          ],
         }],
-        [ 'skia_os == "android" and skia_arch_type == "arm"', {
+        [ 'skia_arch_type == "arm"', {
           # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
           'sources': [
-            '../src/core/SkPaintOptionsAndroid.cpp',
             '../src/core/SkUtilsArm.cpp',
             '../src/core/SkUtilsArm.h',
           ],
diff --git a/pdf.gyp b/pdf.gyp
index afababe..ce4c59f 100644
--- a/pdf.gyp
+++ b/pdf.gyp
@@ -9,45 +9,16 @@
         'skia_lib.gyp:skia_lib',
         'zlib.gyp:zlib',
       ],
+      'includes': [
+        'pdf.gypi',
+      ],
       'include_dirs': [
         '../include/pdf',
         '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
         '../src/utils', # needed to get SkBitSet.h
       ],
       'sources': [
-        '../include/pdf/SkPDFDevice.h',
-        '../include/pdf/SkPDFDocument.h',
-
-        '../src/pdf/SkPDFCatalog.cpp',
-        '../src/pdf/SkPDFCatalog.h',
-        '../src/pdf/SkPDFDevice.cpp',
-        '../src/pdf/SkPDFDocument.cpp',
-        '../src/pdf/SkPDFFont.cpp',
-        '../src/pdf/SkPDFFont.h',
-        '../src/pdf/SkPDFFontImpl.h',
-        '../src/pdf/SkPDFFormXObject.cpp',
-        '../src/pdf/SkPDFFormXObject.h',
-        '../src/pdf/SkPDFGraphicState.cpp',
-        '../src/pdf/SkPDFGraphicState.h',
-        '../src/pdf/SkPDFImage.cpp',
-        '../src/pdf/SkPDFImage.h',
-        '../src/pdf/SkPDFImageStream.cpp',
-        '../src/pdf/SkPDFImageStream.h',
-        '../src/pdf/SkPDFPage.cpp',
-        '../src/pdf/SkPDFPage.h',
-        '../src/pdf/SkPDFResourceDict.cpp',
-        '../src/pdf/SkPDFResourceDict.h',
-        '../src/pdf/SkPDFShader.cpp',
-        '../src/pdf/SkPDFShader.h',
-        '../src/pdf/SkPDFStream.cpp',
-        '../src/pdf/SkPDFStream.h',
-        '../src/pdf/SkPDFTypes.cpp',
-        '../src/pdf/SkPDFTypes.h',
-        '../src/pdf/SkPDFUtils.cpp',
-        '../src/pdf/SkPDFUtils.h',
-        '../src/pdf/SkTSet.h',
-
-        '../src/doc/SkDocument_PDF.cpp',
+        'pdf.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       # This section makes all targets that depend on this target
       # #define SK_SUPPORT_PDF and have access to the pdf header files.
diff --git a/pdf.gypi b/pdf.gypi
new file mode 100644
index 0000000..ae4a032
--- /dev/null
+++ b/pdf.gypi
@@ -0,0 +1,50 @@
+# Include this gypi to include all 'pdf' files
+# The parent gyp/gypi file must define
+#       'skia_src_path'     e.g. skia/trunk/src
+#       'skia_include_path' e.g. skia/trunk/include
+#
+# The skia build defines these in common_variables.gypi
+#
+{
+    'sources': [
+        '<(skia_include_path)/pdf/SkPDFDevice.h',
+        '<(skia_include_path)/pdf/SkPDFDocument.h',
+
+        '<(skia_src_path)/pdf/SkPDFCatalog.cpp',
+        '<(skia_src_path)/pdf/SkPDFCatalog.h',
+        '<(skia_src_path)/pdf/SkPDFDevice.cpp',
+        '<(skia_src_path)/pdf/SkPDFDocument.cpp',
+        '<(skia_src_path)/pdf/SkPDFFont.cpp',
+        '<(skia_src_path)/pdf/SkPDFFont.h',
+        '<(skia_src_path)/pdf/SkPDFFontImpl.h',
+        '<(skia_src_path)/pdf/SkPDFFormXObject.cpp',
+        '<(skia_src_path)/pdf/SkPDFFormXObject.h',
+        '<(skia_src_path)/pdf/SkPDFGraphicState.cpp',
+        '<(skia_src_path)/pdf/SkPDFGraphicState.h',
+        '<(skia_src_path)/pdf/SkPDFImage.cpp',
+        '<(skia_src_path)/pdf/SkPDFImage.h',
+        '<(skia_src_path)/pdf/SkPDFImageStream.cpp',
+        '<(skia_src_path)/pdf/SkPDFImageStream.h',
+        '<(skia_src_path)/pdf/SkPDFPage.cpp',
+        '<(skia_src_path)/pdf/SkPDFPage.h',
+        '<(skia_src_path)/pdf/SkPDFResourceDict.cpp',
+        '<(skia_src_path)/pdf/SkPDFResourceDict.h',
+        '<(skia_src_path)/pdf/SkPDFShader.cpp',
+        '<(skia_src_path)/pdf/SkPDFShader.h',
+        '<(skia_src_path)/pdf/SkPDFStream.cpp',
+        '<(skia_src_path)/pdf/SkPDFStream.h',
+        '<(skia_src_path)/pdf/SkPDFTypes.cpp',
+        '<(skia_src_path)/pdf/SkPDFTypes.h',
+        '<(skia_src_path)/pdf/SkPDFUtils.cpp',
+        '<(skia_src_path)/pdf/SkPDFUtils.h',
+        '<(skia_src_path)/pdf/SkTSet.h',
+
+        '<(skia_src_path)/doc/SkDocument_PDF.cpp',
+    ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/pdfviewer.gyp b/pdfviewer.gyp
index 8552f3b..063c294 100644
--- a/pdfviewer.gyp
+++ b/pdfviewer.gyp
@@ -99,6 +99,22 @@
         'core.gyp:core',
         'flags.gyp:flags',
         'libpdfviewer',
+        'chop_transparency',
+      ],
+    },
+    {
+      'target_name': 'chop_transparency',
+      'type': 'executable',
+      'sources': [
+        '../experimental/PdfViewer/chop_transparency_main.cpp',
+      ],
+      'include_dirs': [
+        # For SkBitmapHasher.h
+        '../src/utils/',
+      ],
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'flags.gyp:flags',
       ],
     },
   ],
diff --git a/tests.gyp b/tests.gyp
index a4ea32d..0bb3550 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -48,6 +48,7 @@
         '../tests/DrawBitmapRectTest.cpp',
         '../tests/DrawPathTest.cpp',
         '../tests/DrawTextTest.cpp',
+        '../tests/DynamicHashTest.cpp',
         '../tests/EmptyPathTest.cpp',
         '../tests/ErrorTest.cpp',
         '../tests/FillPathTest.cpp',
@@ -62,6 +63,7 @@
         '../tests/GLInterfaceValidation.cpp',
         '../tests/GLProgramsTest.cpp',
         '../tests/GpuBitmapCopyTest.cpp',
+        '../tests/GpuDrawPathTest.cpp',
         '../tests/GrContextFactoryTest.cpp',
         '../tests/GradientTest.cpp',
         '../tests/GrMemoryPoolTest.cpp',