Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I2cdcf09998162691ec5ba2988179e1735ab8874f

9 files changed, 55 insertions, 19 deletions

diff --git a/animator.gyp b/animator.gyp
index 06603ba..c4ade17 100644
--- a/animator.gyp
+++ b/animator.gyp
@@ -149,8 +149,8 @@
         '../src/animator/SkOperand2.h',
         '../src/animator/SkOperandInterpolator.h',
         '../src/animator/SkOperandIterpolator.cpp',
-        '../src/animator/SkPaintParts.cpp',
-        '../src/animator/SkPaintParts.h',
+        '../src/animator/SkPaintPart.cpp',
+        '../src/animator/SkPaintPart.h',
         '../src/animator/SkParseSVGPath.cpp',
         '../src/animator/SkPathParts.cpp',
         '../src/animator/SkPathParts.h',
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 9f77c7d..175b8b0 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -91,6 +91,8 @@
               },
             },
           },
+        },
+        'conditions' : [
           # Gyp's ninja generator depends on these specially named
           # configurations to build 64-bit on Windows.
           # See http://skbug.com/2348
@@ -98,17 +100,22 @@
           # We handle the 64- vs 32-bit variations elsewhere, so I think it's
           # OK for us to just make these inherit non-archwidth-specific
           # configurations without modification.
-          'Debug_x64': {
-            'inherit_from': ['Debug'],
-          },
-          'Release_x64': {
-            'inherit_from': ['Release'],
-          },
-          'Release_Developer_x64': {
-            'inherit_from': ['Release_Developer'],
-          },
-        },
-        'conditions' : [
+          #
+          # See http://skbug.com/2442 : These targets cause problems in the
+          # MSVS build, so only include them if gyp is generating a ninja build.
+          [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', {
+            'configurations': {
+              'Debug_x64': {
+                'inherit_from': ['Debug'],
+              },
+              'Release_x64': {
+                'inherit_from': ['Release'],
+              },
+              'Release_Developer_x64': {
+                'inherit_from': ['Release_Developer'],
+              },
+            },
+          }],
           [ 'skia_arch_width == 64', {
             'msvs_configuration_platform': 'x64',
           }],
@@ -295,6 +302,13 @@
         'SK_SUPPORT_LEGACY_GETTOTALCLIP',
         # Still need to switch Android to the new name for N32.
         'kNative_8888_SkColorType kN32_SkColorType',
+        'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
+        'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
+        'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
+        'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
+        'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS',
+        # Needed until we fix skbug.com/2440.
+        'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
       ],
     }],
 
diff --git a/core.gypi b/core.gypi
index 3a8dc21..1bcde4c 100644
--- a/core.gypi
+++ b/core.gypi
@@ -13,6 +13,7 @@
         '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp',
         '<(skia_src_path)/core/SkAlphaRuns.cpp',
         '<(skia_src_path)/core/SkAntiRun.h',
+        '<(skia_src_path)/core/SkBBHFactory.cpp',
         '<(skia_src_path)/core/SkBBoxHierarchy.h',
         '<(skia_src_path)/core/SkBBoxRecord.cpp',
         '<(skia_src_path)/core/SkBBoxRecord.h',
@@ -133,6 +134,7 @@
         '<(skia_src_path)/core/SkPicturePlayback.h',
         '<(skia_src_path)/core/SkPictureRecord.cpp',
         '<(skia_src_path)/core/SkPictureRecord.h',
+        '<(skia_src_path)/core/SkPictureRecorder.cpp',
         '<(skia_src_path)/core/SkPictureShader.cpp',
         '<(skia_src_path)/core/SkPictureShader.h',
         '<(skia_src_path)/core/SkPictureStateTree.cpp',
@@ -158,6 +160,7 @@
         '<(skia_src_path)/core/SkRRect.cpp',
         '<(skia_src_path)/core/SkRTree.h',
         '<(skia_src_path)/core/SkRTree.cpp',
+        '<(skia_src_path)/core/SkRTreePicture.cpp',
         '<(skia_src_path)/core/SkScaledImageCache.cpp',
         '<(skia_src_path)/core/SkScalar.cpp',
         '<(skia_src_path)/core/SkScalerContext.cpp',
@@ -218,6 +221,7 @@
         '<(skia_src_path)/pipe/SkGPipeWrite.cpp',
 
         '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h',
+        '<(skia_include_path)/core/SkBBHFactory.h',
         '<(skia_include_path)/core/SkBitmap.h',
         '<(skia_include_path)/core/SkBitmapDevice.h',
         '<(skia_include_path)/core/SkBlitRow.h',
@@ -270,6 +274,7 @@
         '<(skia_include_path)/core/SkPathMeasure.h',
         '<(skia_include_path)/core/SkPathRef.h',
         '<(skia_include_path)/core/SkPicture.h',
+        '<(skia_include_path)/core/SkPictureRecorder.h',
         '<(skia_include_path)/core/SkPixelRef.h',
         '<(skia_include_path)/core/SkPoint.h',
         '<(skia_include_path)/core/SkPreConfig.h',
@@ -279,6 +284,7 @@
         '<(skia_include_path)/core/SkRefCnt.h',
         '<(skia_include_path)/core/SkRegion.h',
         '<(skia_include_path)/core/SkRRect.h',
+        '<(skia_include_path)/core/SkRTreePicture.h',
         '<(skia_include_path)/core/SkScalar.h',
         '<(skia_include_path)/core/SkShader.h',
         '<(skia_include_path)/core/SkStream.h',
diff --git a/gmslides.gypi b/gmslides.gypi
index e381743..67a9adb 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -80,6 +80,7 @@
     '../gm/getpostextpath.cpp',
     '../gm/giantbitmap.cpp',
     '../gm/gradients.cpp',
+    '../gm/gradients_2pt_conical.cpp',
     '../gm/gradients_no_texture.cpp',
     '../gm/gradientDirtyLaundry.cpp',
     '../gm/gradient_matrix.cpp',
diff --git a/record.gyp b/record.gyp
index 31decb6..0bfd83e 100644
--- a/record.gyp
+++ b/record.gyp
@@ -3,6 +3,7 @@
     'targets': [{
         'target_name': 'record',
         'type': 'static_library',
+        'includes': [ 'record.gypi' ],
         'include_dirs': [
             '../include/config',
             '../include/core',
@@ -13,11 +14,5 @@
                 '../include/record',  # Public headers.
             ],
         },
-        'sources': [
-            '../src/record/SkRecordCulling.cpp',
-            '../src/record/SkRecordDraw.cpp',
-            '../src/record/SkRecorder.cpp',
-            '../src/record/SkRecording.cpp',
-        ],
     }]
 }
diff --git a/record.gypi b/record.gypi
new file mode 100644
index 0000000..adfd462
--- /dev/null
+++ b/record.gypi
@@ -0,0 +1,12 @@
+# Source list for SkRecord
+# The parent gyp/gypi file must define
+#       'skia_src_path'     e.g. skia/trunk/src
+# The Skia build defines this in common_variables.gypi.
+{
+    'sources': [
+        '<(skia_src_path)/record/SkRecordDraw.cpp',
+        '<(skia_src_path)/record/SkRecordOpts.cpp',
+        '<(skia_src_path)/record/SkRecorder.cpp',
+        '<(skia_src_path)/record/SkRecording.cpp',
+    ]
+}
diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi
index c555214..affd807 100644
--- a/skia_for_chromium_defines.gypi
+++ b/skia_for_chromium_defines.gypi
@@ -16,7 +16,11 @@
       'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
       'SK_SUPPORT_LEGACY_GETTOPDEVICE',
       'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
+      'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
+      'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
       'SK_SUPPORT_LEGACY_N32_NAME',
+      'SK_SUPPORT_LEGACY_PROCXFERMODE',
+      'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
     ],
   },
 }
diff --git a/tests.gypi b/tests.gypi
index 5c3ce94..f27b144 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -34,6 +34,7 @@
     '../tests/ARGBImageEncoderTest.cpp',
     '../tests/AndroidPaintTest.cpp',
     '../tests/AnnotationTest.cpp',
+    '../tests/AsADashTest.cpp',
     '../tests/AtomicTest.cpp',
     '../tests/BBoxHierarchyTest.cpp',
     '../tests/BitSetTest.cpp',
@@ -127,6 +128,7 @@
     '../tests/PathTest.cpp',
     '../tests/PathUtilsTest.cpp',
     '../tests/PictureTest.cpp',
+    '../tests/PictureShaderTest.cpp',
     '../tests/PictureUtilsTest.cpp',
     '../tests/PixelRefTest.cpp',
     '../tests/PointTest.cpp',
diff --git a/utils.gyp b/utils.gyp
index 070d18a..5b3d9ea 100644
--- a/utils.gyp
+++ b/utils.gyp
@@ -81,6 +81,8 @@
         '../src/utils/SkGatherPixelRefsAndRects.h',
         '../src/utils/SkInterpolator.cpp',
         '../src/utils/SkLayer.cpp',
+        '../src/utils/SkMatrix22.cpp',
+        '../src/utils/SkMatrix22.h',
         '../src/utils/SkMatrix44.cpp',
         '../src/utils/SkMD5.cpp',
         '../src/utils/SkMD5.h',