commit 9624399ee38abedf8300c02f282f2ed8bd5a6372
author Ben Wagner <bungeman@google.com> Mon Sep 27 12:21:54 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Sep 27 19:17:55 2021 +0000
tree 6c466bef0930734110242b1333b2fd9df99ac10f
parent ef96fa9e83c28334b2060607ac9c815521cb18ad

Remove ICU check from subset_harfbuzz

The Skia build of HarfBuzz does not use ICU, so there is no need to
initialize it. If a user uses a HarfBuzz build which does use ICU, they
will need enuse that ICU is initialized in their own way.

Change-Id: I89bd518dbf3c58aaaee2463a26d6402738dfbf97
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/453140
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/pdf/SkPDFSubsetFont.cpp

diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp
index 2340a79..80f2ee6 100644
--- a/src/pdf/SkPDFSubsetFont.cpp
+++ b/src/pdf/SkPDFSubsetFont.cpp
@@ -3,10 +3,6 @@
 
 #include "src/pdf/SkPDFSubsetFont.h"
 
-#if defined(SK_USING_THIRD_PARTY_ICU)
-#include "SkLoadICU.h"
-#endif
-
 #if defined(SK_PDF_USE_HARFBUZZ_SUBSET)
 
 #include "include/private/SkTemplates.h"
@@ -83,11 +79,6 @@
 static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
                                      const SkPDFGlyphUse& glyphUsage,
                                      int ttcIndex) {
-#if defined(SK_USING_THIRD_PARTY_ICU)
-    if (!SkLoadICU()) {
-        return nullptr;
-    }
-#endif
     if (!fontData) {
         return nullptr;
     }