Backed out changeset 5a2ea27885f0 (bug 1850738) for causing build bus…

…tages on gfxUserFontSet.cpp. CLOSED TREE

DONTBUILD

gfx/thebes/gfxUserFontSet.cpp

@@ -129,20 +129,6 @@ class MOZ_STACK_CLASS gfxOTSMessageContext : public gfxOTSContext {
   virtual void Message(int level, const char* format,
                        ...) MSGFUNC_FMT_ATTR override {
     va_list va;
-
-    // Special-case glyph bounding box warnings: collect all bad glyph IDs,
-    // so we can issue a single message at the end.
-    if (level > 0 && strstr(format, "bbox was incorrect")) {
-      // Extract the glyph ID from the message: it follows the last space in
-      // the message string.
-      const char* lastSpace = rindex(format, ' ');
-      if (lastSpace) {
-        int gid = atoi(lastSpace + 1);
-        mBadBBoxGlyphs.AppendElement(gid);
-      }
-      return;
-    }
-
     va_start(va, format);
 
     nsCString msg;
@@ -169,23 +155,12 @@ class MOZ_STACK_CLASS gfxOTSMessageContext : public gfxOTSContext {
   }
 
   nsTArray<gfxUserFontEntry::OTSMessage>&& TakeMessages() {
-    if (!mBadBBoxGlyphs.IsEmpty()) {
-      nsAutoCString msg("Glyph bbox was incorrect (glyph ids");
-      for (const auto gid : mBadBBoxGlyphs) {
-        msg.Append(" ");
-        msg.AppendInt(gid);
-      }
-      msg.Append(")");
-      mMessages.AppendElement(gfxUserFontEntry::OTSMessage{msg, 1});
-      mBadBBoxGlyphs.Clear();
-    }
     return std::move(mMessages);
   }
 
  private:
   nsTHashSet<nsCString> mWarningsIssued;
   nsTArray<gfxUserFontEntry::OTSMessage> mMessages;
-  nsTArray<uint16_t> mBadBBoxGlyphs;
 };
 
 // Call the OTS library to sanitize an sfnt before attempting to use it.