2 files changed, 4 insertions, 1 deletions
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 46123ab42e..314b8acbaa 100644
--- a/core/fpdfapi/page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -183,5 +183,7 @@ bool GraphicsData::operator<(const GraphicsData& other) const {
 }
 
 bool FontData::operator<(const FontData& other) const {
-  return baseFont < other.baseFont;
+  if (baseFont != other.baseFont)
+    return baseFont < other.baseFont;
+  return type < other.type;
 }
diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h
index 76587d8c32..076ab3f93b 100644
--- a/core/fpdfapi/page/cpdf_page.h
+++ b/core/fpdfapi/page/cpdf_page.h
@@ -31,6 +31,7 @@ struct GraphicsData {
 
 struct FontData {
   CFX_ByteString baseFont;
+  CFX_ByteString type;
   bool operator<(const FontData& other) const;
 };