Merge from Chromium at DEPS revision 267519idea133-weekly-release

This commit was generated by merge_to_master.py.

Change-Id: If4516ffa0889e0aafc1c29ff65cd2d5125661999

16 files changed, 53 insertions, 10 deletions

diff --git a/apptype_console.gypi b/apptype_console.gypi
index 85cc502..cde8779 100644
--- a/apptype_console.gypi
+++ b/apptype_console.gypi
@@ -12,7 +12,7 @@
       },
     },
     'conditions': [
-      [ 'skia_os == "android"', {
+      [ 'skia_os == "android" and not skia_android_framework', {
         'dependencies': [
           'android_deps.gyp:Android_EntryPoint',
           'android_system.gyp:skia_launcher',
diff --git a/bench.gyp b/bench.gyp
index 43924ab..9e8d1d7 100644
--- a/bench.gyp
+++ b/bench.gyp
@@ -52,11 +52,14 @@
         '../bench/BenchSysTimer_windows.h',
         '../bench/BenchSysTimer_windows.cpp',
       ],
-        'include_dirs': [
+      'include_dirs': [
         '../src/core',
         '../src/gpu',
         '../tools',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': ['../bench'],
+      },
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
diff --git a/common.gypi b/common.gypi
index 2a5bbd4..0846fef 100644
--- a/common.gypi
+++ b/common.gypi
@@ -12,6 +12,7 @@
 
   'target_defaults': {
     'defines': [
+      'SK_INTERNAL',
       'SK_GAMMA_SRGB',
       'SK_GAMMA_APPLY_TO_A8',
       'SK_SCALAR_TO_FLOAT_EXCLUDED',  # temporary to allow Chrome to call SkFloatToScalar
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 175b8b0..77dd925 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -307,8 +307,11 @@
         'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
         'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
         'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS',
+        'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
         # Needed until we fix skbug.com/2440.
         'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
+        # Transitional, for deprecated SkCanvas::SaveFlags methods.
+        'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
       ],
     }],
 
diff --git a/dm.gyp b/dm.gyp
index 8bb8ddf..4cfcdc6 100644
--- a/dm.gyp
+++ b/dm.gyp
@@ -33,6 +33,7 @@
             '../dm/DMExpectationsTask.cpp',
             '../dm/DMGpuGMTask.cpp',
             '../dm/DMPipeTask.cpp',
+            '../dm/DMQuiltTask.cpp',
             '../dm/DMRecordTask.cpp',
             '../dm/DMReplayTask.cpp',
             '../dm/DMReporter.cpp',
@@ -40,7 +41,6 @@
             '../dm/DMTask.cpp',
             '../dm/DMTaskRunner.cpp',
             '../dm/DMTestTask.cpp',
-            '../dm/DMTileGridTask.cpp',
             '../dm/DMUtil.cpp',
             '../dm/DMWriteTask.cpp',
             '../gm/gm.cpp',
diff --git a/gmslides.gypi b/gmslides.gypi
index 67a9adb..d4c6c1c 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -56,6 +56,7 @@
     '../gm/cubicpaths.cpp',
     '../gm/cmykjpeg.cpp',
     '../gm/degeneratesegments.cpp',
+    '../gm/discard.cpp',
     '../gm/dashcubics.cpp',
     '../gm/dashing.cpp',
     '../gm/deviceproperties.cpp',
diff --git a/gpu.gypi b/gpu.gypi
index 5eb9a79..efeeb2d 100644
--- a/gpu.gypi
+++ b/gpu.gypi
@@ -164,6 +164,8 @@
       '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp',
       '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h',
 
+      '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
+      '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp',
       '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h',
       '<(skia_src_path)/gpu/gl/GrGLCaps.cpp',
diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp
index 87e125b..51af1e9 100644
--- a/pathops_unittest.gyp
+++ b/pathops_unittest.gyp
@@ -24,6 +24,7 @@
       'sources': [
         '../tests/PathOpsAngleIdeas.cpp',
         '../tests/PathOpsDebug.cpp',
+        '../tests/PathOpsOpLoopThreadedTest.cpp',
         '../tests/PathOpsSkpClipTest.cpp',
         '../tests/Test.cpp',
         '../tests/skia_test.cpp',
diff --git a/record.gyp b/record.gyp
index 0bfd83e..5fa7f81 100644
--- a/record.gyp
+++ b/record.gyp
@@ -8,6 +8,7 @@
             '../include/config',
             '../include/core',
             '../include/record',
+            '../src/utils',
         ],
         'direct_dependent_settings': {
             'include_dirs': [
diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi
index affd807..1ec908e 100644
--- a/skia_for_chromium_defines.gypi
+++ b/skia_for_chromium_defines.gypi
@@ -15,12 +15,13 @@
     'skia_for_chromium_defines': [
       '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_DERIVED_PICTURE_CLASSES',
       'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
+      'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
+      'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
+      'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
     ],
   },
 }
diff --git a/tests.gyp b/tests.gyp
index d0a898c..0d6ed5a 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -15,6 +15,16 @@
         '../tests/skia_test.cpp',
       ],
       'conditions': [
+        [ 'skia_android_framework == 1', {
+          'libraries': [
+            '-lskia',
+            '-lcutils',
+          ],
+          'libraries!': [
+            '-lz',
+            '-llog',
+          ],
+        }],
         [ 'skia_gpu == 1', {
           'include_dirs': [
             '../src/gpu',
diff --git a/tests.gypi b/tests.gypi
index f27b144..afe256c 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -129,6 +129,7 @@
     '../tests/PathUtilsTest.cpp',
     '../tests/PictureTest.cpp',
     '../tests/PictureShaderTest.cpp',
+    '../tests/PictureStateTreeTest.cpp',
     '../tests/PictureUtilsTest.cpp',
     '../tests/PixelRefTest.cpp',
     '../tests/PointTest.cpp',
@@ -139,8 +140,8 @@
     '../tests/ReadPixelsTest.cpp',
     '../tests/ReadWriteAlphaTest.cpp',
     '../tests/Reader32Test.cpp',
-    '../tests/RecordCullingTest.cpp',
     '../tests/RecordDrawTest.cpp',
+    '../tests/RecordOptsTest.cpp',
     '../tests/RecordTest.cpp',
     '../tests/RecorderTest.cpp',
     '../tests/RecordingTest.cpp',
diff --git a/tools.gyp b/tools.gyp
index 39a7847..7993b50 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -18,6 +18,7 @@
         'bench_record',
         'bench_playback',
         'filter',
+        'gpuveto',
         'lua_app',
         'lua_pictures',
         'pinspect',
@@ -198,7 +199,24 @@
         'skia_lib.gyp:skia_lib',
       ],
     },
-
+    {
+      'target_name': 'gpuveto',
+      'type': 'executable',
+      'sources': [
+        '../tools/gpuveto.cpp',
+        '../tools/LazyDecodeBitmap.cpp',
+      ],
+      'include_dirs': [
+        '../src/core/',
+        '../src/images',
+        '../src/lazy',
+        '../tools/flags',
+      ],
+      'dependencies': [
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+      ],
+    },
     {
       'target_name': 'lua_app',
       'type': 'executable',
@@ -303,6 +321,7 @@
         '../src/lazy',
       ],
       'dependencies': [
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
         'record.gyp:*',
@@ -320,6 +339,7 @@
         '../src/record',
       ],
       'dependencies': [
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
         'record.gyp:*',
diff --git a/views.gyp b/views.gyp
index b94061a..6db85df 100644
--- a/views.gyp
+++ b/views.gyp
@@ -13,7 +13,6 @@
       'standalone_static_library': 1,
       'dependencies': [
         'skia_lib.gyp:skia_lib',
-        'angle.gyp:*',
         'xml.gyp:*',
       ],
       'include_dirs': [
diff --git a/views_animated.gyp b/views_animated.gyp
index 01ec4fa..c10e9f7 100644
--- a/views_animated.gyp
+++ b/views_animated.gyp
@@ -7,7 +7,6 @@
       'type': 'static_library',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
-        'angle.gyp:*',
         'animator.gyp:*',
         'views.gyp:*',
         'xml.gyp:*',
diff --git a/webtry.gyp b/webtry.gyp
index 1f476f3..63f71b9 100644
--- a/webtry.gyp
+++ b/webtry.gyp
@@ -7,6 +7,7 @@
       'include_dirs' : [
         '../src/core',
         '../src/images',
+        '../src/pathops',
         ],
        'sources': [
          '../experimental/webtry/result.cpp',