Revert "Roll Skia"

This reverts commit eeafe3a5.

DEPS

@@ -21,7 +21,7 @@ vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'mojo_sdk_revision': 'c29387104b5fbcbf681e2da2559a3db5860f153f',
   'mojo_devtools_revision': '49879d78ce4486e10c2214a101d9b2e82794b2f4',
-  'skia_revision': '52e2581700b719aad317605160a2cef45d3db68b',
+  'skia_revision': '87ed6be0e4ea8b0a88915045f697d0fd734ed6f5',
 
   # Note: When updating the Dart revision, ensure that all entries that are
   # dependencies of dart are also updated

skia/BUILD.gn

@@ -464,7 +464,6 @@ component("skia") {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
       "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
     ]
   }
@@ -555,7 +554,7 @@ source_set("skia_opts") {
 
   if (current_cpu == "x86" || current_cpu == "x64") {
     sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources +
-              gypi_skia_opts.sse41_sources + gypi_skia_opts.avx_sources +
+              gypi_skia_opts.sse41_sources +
               [
                 # Chrome-specific.
                 "ext/convolver_SSE2.cc",

skia/skia_gn_files.gypi

@@ -14,7 +14,6 @@
     '<(skia_src_path)/images/SkScaledBitmapSampler.cpp',
     '<(skia_src_path)/images/SkScaledBitmapSampler.h',
     '<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp',
-    '<(skia_src_path)/ports/SkFontConfigInterface_direct_factory.cpp',
     '<(skia_src_path)/ports/SkFontHost_fontconfig.cpp',
     '<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp',
     '<(skia_src_path)/ports/SkFontHost_FreeType_common.h',

skia/skia_library.gypi

@@ -30,7 +30,6 @@
     '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
-    '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
     '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
@@ -232,7 +231,6 @@
     [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
-        '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp',
         '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
         '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
       ],

sky/compositor/picture_serializer.cc

@@ -14,12 +14,12 @@ namespace sky {
 class PngPixelSerializer : public SkPixelSerializer {
  public:
   bool onUseEncodedData(const void*, size_t) override { return true; }
-
-  SkData* onEncode(const SkPixmap& pixmap) override {
+  SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
+      size_t row_bytes) override {
     std::vector<unsigned char> data;
 
     SkBitmap bm;
-    if (!bm.installPixels(pixmap))
+    if (!bm.installPixels(info, const_cast<void*>(pixels), row_bytes))
       return nullptr;
     if (!gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &data))
       return nullptr;