Merge to XFA: Member function name refactoring

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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 "core/src/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 690 matching lines @@
   if (name == m_LastImageName && m_pLastImage && m_pLastImage->GetStream() &&
       m_pLastImage->GetStream()->GetObjNum()) {
     AddImage(nullptr, m_pLastImage, FALSE);
     return;
   }
 
   if (m_Options.m_bTextOnly) {
     if (!m_pResources)
       return;
 
-    CPDF_Dictionary* pList = m_pResources->GetDict("XObject");
+    CPDF_Dictionary* pList = m_pResources->GetDictBy("XObject");
     if (!pList && m_pPageResources && m_pResources != m_pPageResources)
-      pList = m_pPageResources->GetDict("XObject");
+      pList = m_pPageResources->GetDictBy("XObject");
     if (!pList)
       return;
     CPDF_Reference* pRes = ToReference(pList->GetElement(name));
     if (!pRes)
       return;
 
     FX_BOOL bForm;
     if (m_pDocument->IsFormStream(pRes->GetRefObjNum(), bForm) && !bForm)
       return;
   }
 
   CPDF_Stream* pXObject = ToStream(FindResourceObj("XObject", name));
   if (!pXObject) {
     m_bResourceMissing = TRUE;
     return;
   }
 
   CFX_ByteStringC type = pXObject->GetDict()
-                             ? pXObject->GetDict()->GetConstString("Subtype")
+                             ? pXObject->GetDict()->GetConstStringBy("Subtype")
                              : CFX_ByteStringC();
   if (type == "Image") {
     if (m_Options.m_bTextOnly) {
       return;
     }
     CPDF_ImageObject* pObj = AddImage(pXObject, NULL, FALSE);
     m_LastImageName = name;
     m_pLastImage = pObj->m_pImage;
     if (!m_pObjectList->HasImageMask())
       m_pObjectList->SetHasImageMask(m_pLastImage->IsMask());
   } else if (type == "Form") {
     AddForm(pXObject);
   } else {
     return;
   }
 }
 
 void CPDF_StreamContentParser::AddForm(CPDF_Stream* pStream) {
   if (!m_Options.m_bSeparateForm) {
-    CPDF_Dictionary* pResources = pStream->GetDict()->GetDict("Resources");
-    CFX_Matrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
+    CPDF_Dictionary* pResources = pStream->GetDict()->GetDictBy("Resources");
+    CFX_Matrix form_matrix = pStream->GetDict()->GetMatrixBy("Matrix");
     form_matrix.Concat(m_pCurStates->m_CTM);
-    CPDF_Array* pBBox = pStream->GetDict()->GetArray("BBox");
+    CPDF_Array* pBBox = pStream->GetDict()->GetArrayBy("BBox");
     CFX_FloatRect form_bbox;
     CPDF_Path ClipPath;
     if (pBBox) {
-      form_bbox = pStream->GetDict()->GetRect("BBox");
+      form_bbox = pStream->GetDict()->GetRectBy("BBox");
       ClipPath.New();
       ClipPath.AppendRect(form_bbox.left, form_bbox.bottom, form_bbox.right,
                           form_bbox.top);
       ClipPath.Transform(&form_matrix);
       form_bbox.Transform(&form_matrix);
     }
     CPDF_StreamContentParser parser(m_pDocument, m_pPageResources, m_pResources,
                                     &m_mtContentToUser, m_pObjectList,
                                     pResources, &form_bbox, &m_Options,
                                     m_pCurStates.get(), m_Level + 1);
@@ skipping 472 matching lines @@
   }
 }
 
 CPDF_Object* CPDF_StreamContentParser::FindResourceObj(
     const CFX_ByteStringC& type,
     const CFX_ByteString& name) {
   if (!m_pResources) {
     return NULL;
   }
   if (m_pResources == m_pPageResources) {
-    CPDF_Dictionary* pList = m_pResources->GetDict(type);
+    CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
     if (!pList) {
       return NULL;
     }
     CPDF_Object* pRes = pList->GetElementValue(name);
     return pRes;
   }
-  CPDF_Dictionary* pList = m_pResources->GetDict(type);
+  CPDF_Dictionary* pList = m_pResources->GetDictBy(type);
   if (!pList) {
     if (!m_pPageResources) {
       return NULL;
     }
-    CPDF_Dictionary* pList = m_pPageResources->GetDict(type);
+    CPDF_Dictionary* pList = m_pPageResources->GetDictBy(type);
     if (!pList) {
       return NULL;
     }
     CPDF_Object* pRes = pList->GetElementValue(name);
     return pRes;
   }
   CPDF_Object* pRes = pList->GetElementValue(name);
   return pRes;
 }
 
@@ skipping 145 matching lines @@
   }
   int n = pArray->GetCount();
   int nsegs = 0;
   for (int i = 0; i < n; i++) {
     if (pArray->GetElementValue(i)->IsString())
       nsegs++;
   }
   if (nsegs == 0) {
     for (int i = 0; i < n; i++) {
       m_pCurStates->m_TextX -=
-          FXSYS_Mul(pArray->GetNumber(i),
+          FXSYS_Mul(pArray->GetNumberAt(i),
                     m_pCurStates->m_TextState.GetFontSize()) /
           1000;
     }
     return;
   }
   CFX_ByteString* pStrs = new CFX_ByteString[nsegs];
   FX_FLOAT* pKerning = FX_Alloc(FX_FLOAT, nsegs);
   int iSegment = 0;
   FX_FLOAT fInitKerning = 0;
   for (int i = 0; i < n; i++) {
@@ skipping 372 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }