From 765524ce69ba3f4b4e1a63eac891854ae625ccb4 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 16 Dec 2015 14:18:58 -0800 Subject: [PATCH] Revert "Roll Skia" This reverts commit 28a7f722564ff831b8794b877be56fc80f1c351d. --- DEPS | 2 +- engine/src/flutter/skia/BUILD.gn | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index a4661d6432..ed5921006d 100644 --- a/DEPS +++ b/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 diff --git a/engine/src/flutter/skia/BUILD.gn b/engine/src/flutter/skia/BUILD.gn index 8c8c22083e..e61fd0c310 100644 --- a/engine/src/flutter/skia/BUILD.gn +++ b/engine/src/flutter/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",