Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: If5e90bc6012d33cc92fc74693cfccfa4c959d35f

10 files changed, 44 insertions, 20 deletions

diff --git a/bench.gypi b/bench.gypi
index 6680e75..1b3bc12 100644
--- a/bench.gypi
+++ b/bench.gypi
@@ -44,6 +44,7 @@
     '../bench/HairlinePathBench.cpp',
     '../bench/ImageCacheBench.cpp',
     '../bench/ImageDecodeBench.cpp',
+    '../bench/ImageFilterDAGBench.cpp',
     '../bench/InterpBench.cpp',
     '../bench/LightingBench.cpp',
     '../bench/LineBench.cpp',
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 3743b60..9f77c7d 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -274,18 +274,10 @@
         # using freetype's embolden allows us to adjust fake bold settings at
         # draw-time, at which point we know which SkTypeface is being drawn
         'SK_USE_FREETYPE_EMBOLDEN',
-        # Android provides at least FreeType 2.4.0 at runtime.
-        'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400',
-        # Skia should not use dlopen on Android.
-        'SK_CAN_USE_DLOPEN 0',
         'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
         # When built as part of the system image we can enable certian non-NDK
         # compliant optimizations.
         'SK_BUILD_FOR_ANDROID_FRAMEWORK',
-        # Android Text Tuning
-        'SK_GAMMA_APPLY_TO_A8',
-        'SK_GAMMA_EXPONENT 1.4',
-        'SK_GAMMA_CONTRAST 0.0',
         # Optimizations for chromium (m30)
         'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
         'IGNORE_ROT_AA_RECT_OPT',
@@ -301,9 +293,8 @@
         # Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/
         # lands.
         'SK_SUPPORT_LEGACY_GETTOTALCLIP',
-        # Use a better name for kPMColor_SkColorType until
-        # https://code.google.com/p/skia/issues/detail?id=2384 is fixed.
-        'kNative_8888_SkColorType kPMColor_SkColorType',
+        # Still need to switch Android to the new name for N32.
+        'kNative_8888_SkColorType kN32_SkColorType',
       ],
     }],
 
@@ -553,6 +544,14 @@
         'defines': [
           'SK_BUILD_FOR_ANDROID',
           'SK_FONTHOST_DOES_NOT_USE_FONTMGR',
+
+          # Android Text Tuning
+          'SK_GAMMA_EXPONENT=1.4',
+          'SK_GAMMA_CONTRAST=0.0',
+        ],
+        # Android defines a fixed gamma exponent instead of using SRGB
+        'defines!': [
+          'SK_GAMMA_SRGB',
         ],
         'configurations': {
           'Debug': {
diff --git a/core.gypi b/core.gypi
index 4a923d7..3a8dc21 100644
--- a/core.gypi
+++ b/core.gypi
@@ -115,7 +115,6 @@
         '<(skia_src_path)/core/SkMessageBus.h',
         '<(skia_src_path)/core/SkMetaData.cpp',
         '<(skia_src_path)/core/SkMipMap.cpp',
-        '<(skia_src_path)/core/SkOffsetTable.h',
         '<(skia_src_path)/core/SkPackBits.cpp',
         '<(skia_src_path)/core/SkPaint.cpp',
         '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp',
@@ -209,12 +208,10 @@
         '<(skia_src_path)/image/SkImagePriv.cpp',
         '<(skia_src_path)/image/SkImage_Codec.cpp',
 #        '<(skia_src_path)/image/SkImage_Gpu.cpp',
-        '<(skia_src_path)/image/SkImage_Picture.cpp',
         '<(skia_src_path)/image/SkImage_Raster.cpp',
         '<(skia_src_path)/image/SkSurface.cpp',
         '<(skia_src_path)/image/SkSurface_Base.h',
 #        '<(skia_src_path)/image/SkSurface_Gpu.cpp',
-        '<(skia_src_path)/image/SkSurface_Picture.cpp',
         '<(skia_src_path)/image/SkSurface_Raster.cpp',
 
         '<(skia_src_path)/pipe/SkGPipeRead.cpp',
diff --git a/opts.gyp b/opts.gyp
index 783ea4e..36af0c4 100644
--- a/opts.gyp
+++ b/opts.gyp
@@ -56,7 +56,7 @@
             '../src/opts/SkBlurImage_opts_SSE2.cpp',
             '../src/opts/SkMorphology_opts_SSE2.cpp',
             '../src/opts/SkUtils_opts_SSE2.cpp',
-            '../src/opts/SkXfermode_opts_none.cpp',
+            '../src/opts/SkXfermode_opts_SSE2.cpp',
           ],
         }],
         [ 'skia_arch_type == "arm" and arm_version >= 7', {
@@ -103,7 +103,7 @@
         }],
         [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
-            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', {
+            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp
index 49af7d7..87e125b 100644
--- a/pathops_unittest.gyp
+++ b/pathops_unittest.gyp
@@ -22,6 +22,8 @@
         'pathops_unittest.gypi',
       ],
       'sources': [
+        '../tests/PathOpsAngleIdeas.cpp',
+        '../tests/PathOpsDebug.cpp',
         '../tests/PathOpsSkpClipTest.cpp',
         '../tests/Test.cpp',
         '../tests/skia_test.cpp',
diff --git a/record.gyp b/record.gyp
index ae80f7c..31decb6 100644
--- a/record.gyp
+++ b/record.gyp
@@ -6,16 +6,18 @@
         'include_dirs': [
             '../include/config',
             '../include/core',
+            '../include/record',
         ],
         'direct_dependent_settings': {
             'include_dirs': [
-                '../src/record',
+                '../include/record',  # Public headers.
             ],
         },
         'sources': [
-            '../src/record/SkRecorder.cpp',
             '../src/record/SkRecordCulling.cpp',
             '../src/record/SkRecordDraw.cpp',
+            '../src/record/SkRecorder.cpp',
+            '../src/record/SkRecording.cpp',
         ],
     }]
 }
diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi
index a547f73..c555214 100644
--- a/skia_for_chromium_defines.gypi
+++ b/skia_for_chromium_defines.gypi
@@ -14,8 +14,9 @@
     #
     'skia_for_chromium_defines': [
       'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
-      'SK_SUPPORT_LEGACY_GETTOTALCLIP',
       'SK_SUPPORT_LEGACY_GETTOPDEVICE',
+      'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
+      'SK_SUPPORT_LEGACY_N32_NAME',
     ],
   },
 }
diff --git a/tests.gypi b/tests.gypi
index a3d1e50..5c3ce94 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -9,6 +9,7 @@
     '../src/pathops',
     '../src/pdf',
     '../src/pipe/utils',
+    '../src/record',
     '../src/utils',
     '../src/utils/debugger',
     '../tools/',
@@ -102,6 +103,7 @@
     '../tests/JpegTest.cpp',
     '../tests/LListTest.cpp',
     '../tests/LayerDrawLooperTest.cpp',
+    '../tests/LayerRasterizerTest.cpp',
     '../tests/MD5Test.cpp',
     '../tests/MallocPixelRefTest.cpp',
     '../tests/MathTest.cpp',
@@ -136,8 +138,10 @@
     '../tests/ReadWriteAlphaTest.cpp',
     '../tests/Reader32Test.cpp',
     '../tests/RecordCullingTest.cpp',
+    '../tests/RecordDrawTest.cpp',
     '../tests/RecordTest.cpp',
     '../tests/RecorderTest.cpp',
+    '../tests/RecordingTest.cpp',
     '../tests/RefCntTest.cpp',
     '../tests/RefDictTest.cpp',
     '../tests/RegionTest.cpp',
diff --git a/tools.gyp b/tools.gyp
index 079fd4d..39a7847 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -16,6 +16,7 @@
         'bbh_shootout',
         'bench_pictures',
         'bench_record',
+        'bench_playback',
         'filter',
         'lua_app',
         'lua_pictures',
@@ -308,6 +309,23 @@
       ],
     },
     {
+      'target_name': 'bench_playback',
+      'type': 'executable',
+      'sources': [
+        '../tools/bench_playback.cpp',
+      ],
+      'include_dirs': [
+        '../src/core/',
+        '../src/images',
+        '../src/record',
+      ],
+      'dependencies': [
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+        'record.gyp:*',
+      ],
+    },
+    {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
diff --git a/webtry.gyp b/webtry.gyp
index ba0b926..1f476f3 100644
--- a/webtry.gyp
+++ b/webtry.gyp
@@ -4,13 +4,13 @@
     {
       'target_name': 'webtry',
       'type': 'executable',
-      'mac_bundle' : 1,
       'include_dirs' : [
         '../src/core',
         '../src/images',
         ],
        'sources': [
          '../experimental/webtry/result.cpp',
+         '../experimental/webtry/main.cpp',
        ],
        'dependencies': [
          'flags.gyp:flags',