commit b7d581997f2b1cebb8f8361f84c2eab8162b2836
author Kevin Lubick <kjlubick@google.com> Tue Nov 14 08:35:09 2023 -0500
committer Kevin Lubick <kjlubick@google.com> Tue Nov 14 13:51:57 2023 +0000
tree d230b21d440ff54ae3d1415a574644d9f4715569
parent f22c7159603967a2b98c05b5e143980cdd477874

Partially revert fuzz SkFontMgr changes

Chrome builds these fuzzers for Windows [1], so we will
need to re-land these changes with some Chromium-side
build changes (probably GNI file lists).

[1] https://source.chromium.org/chromium/chromium/src/+/main:skia/tools/fuzzers/BUILD.gn;l=10;drc=0eb3d308534e45fea7a892e0458eecaf55d36592

Change-Id: I9b9004a6765f54e53cc65d712a1f17a5cf85b67d
Bug: b/305780908
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/778676
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Nicolette Prevost <nicolettep@google.com>
Reviewed-by: Nicolette Prevost <nicolettep@google.com>

fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp

diff --git a/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp b/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
index ad267b5..0a69ac6 100644
--- a/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
+++ b/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
@@ -11,7 +11,8 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkImageFilter.h"
 #include "include/core/SkPaint.h"
-#include "tools/fonts/FontToolUtils.h"
+#include "src/core/SkFontMgrPriv.h"
+#include "tools/fonts/TestFontMgr.h"
 
 void FuzzImageFilterDeserialize(const uint8_t *data, size_t size) {
     const int BitmapSize = 24;
@@ -43,7 +44,7 @@
     if (size > 10024) {
         return 0;
     }
-    ToolUtils::UsePortableFontMgr();
+    gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
     FuzzImageFilterDeserialize(data, size);
     return 0;
 }

fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp

diff --git a/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp b/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp
index fab6256..1475f1b 100644
--- a/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp
+++ b/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp
@@ -8,9 +8,10 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkSurface.h"
+#include "src/core/SkFontMgrPriv.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkTextBlobPriv.h"
-#include "tools/fonts/FontToolUtils.h"
+#include "tools/fonts/TestFontMgr.h"
 
 void FuzzTextBlobDeserialize(const uint8_t *data, size_t size) {
     SkReadBuffer buf(data, size);
@@ -33,7 +34,7 @@
     if (size > 1024) {
         return 0;
     }
-    ToolUtils::UsePortableFontMgr();
+    gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
     FuzzTextBlobDeserialize(data, size);
     return 0;
 }