Merge to XFA: Clean up misc nits found while fixing bugs.

fpdfsdk/src/pdfwindow/PWL_FontMap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
-#define DEFAULT_FONT_NAME "Helvetica"
+namespace {
+
+const char kDefaultFontName[] = "Helvetica";
+
+const char* const g_sDEStandardFontName[] = {"Courier",
+                                             "Courier-Bold",
+                                             "Courier-BoldOblique",
+                                             "Courier-Oblique",
+                                             "Helvetica",
+                                             "Helvetica-Bold",
+                                             "Helvetica-BoldOblique",
+                                             "Helvetica-Oblique",
+                                             "Times-Roman",
+                                             "Times-Bold",
+                                             "Times-Italic",
+                                             "Times-BoldItalic",
+                                             "Symbol",
+                                             "ZapfDingbats"};
+
+}  // namespace
 
 CPWL_FontMap::CPWL_FontMap(IFX_SystemHandler* pSystemHandler)
     : m_pPDFDoc(NULL), m_pSystemHandler(pSystemHandler) {
   ASSERT(m_pSystemHandler);
 }
 
 CPWL_FontMap::~CPWL_FontMap() {
   delete m_pPDFDoc;
   m_pPDFDoc = NULL;
 
@@ skipping 121 matching lines @@
   }
   {
     for (int32_t i = 0, sz = m_aNativeFont.GetSize(); i < sz; i++)
       delete m_aNativeFont.GetAt(i);
 
     m_aNativeFont.RemoveAll();
   }
 }
 
 void CPWL_FontMap::Initialize() {
-  GetFontIndex(DEFAULT_FONT_NAME, ANSI_CHARSET, FALSE);
+  GetFontIndex(kDefaultFontName, ANSI_CHARSET, FALSE);
 }
 
-/*
-List of currently supported standard fonts:
-Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique
-Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique
-Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic
-Symbol, ZapfDingbats
-*/
-
-const char* g_sDEStandardFontName[] = {"Courier",
-                                       "Courier-Bold",
-                                       "Courier-BoldOblique",
-                                       "Courier-Oblique",
-                                       "Helvetica",
-                                       "Helvetica-Bold",
-                                       "Helvetica-BoldOblique",
-                                       "Helvetica-Oblique",
-                                       "Times-Roman",
-                                       "Times-Bold",
-                                       "Times-Italic",
-                                       "Times-BoldItalic",
-                                       "Symbol",
-                                       "ZapfDingbats"};
-
 FX_BOOL CPWL_FontMap::IsStandardFont(const CFX_ByteString& sFontName) {
-  for (int32_t i = 0; i < 14; i++) {
+  for (int32_t i = 0; i < FX_ArraySize(g_sDEStandardFontName); ++i) {
     if (sFontName == g_sDEStandardFontName[i])
       return TRUE;
   }
 
   return FALSE;
 }
 
 int32_t CPWL_FontMap::FindFont(const CFX_ByteString& sFontName,
                                int32_t nCharset) {
   for (int32_t i = 0, sz = m_aData.GetSize(); i < sz; i++) {
@@ skipping 301 matching lines @@
 
 CPWL_DocFontMap::CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler,
                                  CPDF_Document* pAttachedDoc)
     : CPWL_FontMap(pSystemHandler), m_pAttachedDoc(pAttachedDoc) {}
 
 CPWL_DocFontMap::~CPWL_DocFontMap() {}
 
 CPDF_Document* CPWL_DocFontMap::GetDocument() {
   return m_pAttachedDoc;
 }