Update Skia

DEPS

@@ -22,7 +22,7 @@ vars = {
   'mojo_sdk_revision': '172be18ea745ab29aea132e6cb952e726dc32543',
   'mojo_devtools_revision': '49879d78ce4486e10c2214a101d9b2e82794b2f4',
   'base_revision': '6c89618151eb0e23d330778e6d6ea16fc6105010',
-  'skia_revision': '609d97918788c077514f190b0f1087ccbd420f5d',
+  'skia_revision': 'f6bfccd562f4ac071db9902097ad4bea83294085',
 
   # Note: When updating the Dart revision, ensure that all entries that are
   # dependencies of dart are also updated

skia/BUILD.gn

@@ -95,6 +95,7 @@ config("skia_config") {
     "config",
     "ext",
     "//third_party/skia/include/c",
+    "//third_party/skia/include/client/android",
     "//third_party/skia/include/config",
     "//third_party/skia/include/core",
     "//third_party/skia/include/effects",
@@ -317,8 +318,6 @@ component("skia") {
 
   # Remove unused util files include in utils.gypi
   sources -= [
-    "//third_party/skia/src/utils/SkBitmapHasher.cpp",
-    "//third_party/skia/src/utils/SkBitmapHasher.h",
     "//third_party/skia/src/utils/SkBoundaryPatch.cpp",
     "//third_party/skia/src/utils/SkCamera.cpp",
     "//third_party/skia/src/utils/SkCanvasStack.h",
@@ -333,8 +332,6 @@ component("skia") {
     "//third_party/skia/src/utils/SkNinePatch.cpp",
     "//third_party/skia/src/utils/SkOSFile.cpp",
     "//third_party/skia/src/utils/SkParsePath.cpp",
-    "//third_party/skia/src/utils/SkSHA1.cpp",
-    "//third_party/skia/src/utils/SkSHA1.h",
     "//third_party/skia/src/utils/SkTFitsIn.h",
 
     #testing

skia/ext/SkMemory_new_handler.cpp

@@ -23,8 +23,7 @@ static inline void* throw_on_failure(size_t size, void* p) {
     return p;
 }
 
-void sk_throw() {
-    SkASSERT(!"sk_throw");
+void sk_abort_no_print() {
     abort();
 }
 

sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp

@@ -39,7 +39,6 @@
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/core/SkUtils.h"
 
 #include "hb.h"
 #include "sky/engine/wtf/HashMap.h"

sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp

@@ -40,7 +40,6 @@
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/core/SkTypes.h"
-#include "third_party/skia/include/core/SkUtils.h"
 
 namespace blink {
 
@@ -276,7 +275,7 @@ bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters
 
 bool SimpleFontData::fillGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength) const
 {
-    if (SkUTF16_IsHighSurrogate(buffer[bufferLength-1])) {
+    if (U16_IS_LEAD(buffer[bufferLength-1])) {
         SkDebugf("%s last char is high-surrogate", __FUNCTION__);
         return false;
     }