commit a274b41b901113adba297f0eb01394f6c175992c
author Lei Zhang <thestig@chromium.org> Fri Nov 16 21:35:31 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Nov 16 21:35:31 2018 +0000
tree db9341841bcf04d3b19b8e936a902b8ba141f5ae
parent 75d214c50d2f216bc3a6a508c509490d16f41fd3

Slightly simplify CPDF_FontEncoding::Realize().

Relanding after commit 2aa7e8cb.

Change-Id: I962a82b46f05b8c4efcc84699df7598e7f13773a
Reviewed-on: https://pdfium-review.googlesource.com/c/45731
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/font/cpdf_fontencoding.cpp

diff --git a/core/fpdfapi/font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp
index 22950f6..8bddb94 100644
--- a/core/fpdfapi/font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/font/cpdf_fontencoding.cpp
@@ -1699,14 +1699,17 @@
     }
   }
   if (predefined) {
+    const char* pName;
     if (predefined == PDFFONT_ENCODING_WINANSI)
-      return pdfium::MakeUnique<CPDF_Name>(pPool, "WinAnsiEncoding");
-    if (predefined == PDFFONT_ENCODING_MACROMAN)
-      return pdfium::MakeUnique<CPDF_Name>(pPool, "MacRomanEncoding");
-    if (predefined == PDFFONT_ENCODING_MACEXPERT)
-      return pdfium::MakeUnique<CPDF_Name>(pPool, "MacExpertEncoding");
+      pName = "WinAnsiEncoding";
+    else if (predefined == PDFFONT_ENCODING_MACROMAN)
+      pName = "MacRomanEncoding";
+    else if (predefined == PDFFONT_ENCODING_MACEXPERT)
+      pName = "MacExpertEncoding";
+    else
+      return nullptr;
 
-    return nullptr;
+    return pdfium::MakeUnique<CPDF_Name>(pPool, pName);
   }
   const uint16_t* pStandard =
       PDF_UnicodesForPredefinedCharSet(PDFFONT_ENCODING_WINANSI);