Rename GetElementValue() to GetDirectObject{By,At}().

xfa/fxfa/parser/xfa_basic_imp.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 "xfa/fxfa/parser/xfa_basic_imp.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
@@ skipping 169 matching lines @@
 CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement,
                                                       XFA_ATTRIBUTE eAttribute,
                                                       uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Measure, dwPacket)) {
     return *(CXFA_Measurement*)pValue;
   }
   return CXFA_Measurement();
 }
-int32_t XFA_GetElementCount() {
+int32_t XFA_GetObjectByCount() {

[dsinclair, 2016/03/29 20:45:25]

nit: Don't think we want a By here?

[Tom Sepez, 2016/03/29 20:58:13]

Reverted this entire file.

   return g_iXFAElementCount;
 }
-const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName) {
+const XFA_ELEMENTINFO* XFA_GetObjectByByName(const CFX_WideStringC& wsName) {

[dsinclair, 2016/03/29 20:45:25]

nit: GetObjectByName

   int32_t iLength = wsName.GetLength();
   if (iLength == 0) {
     return NULL;
   }
   uint32_t uHash = FX_HashCode_String_GetW(wsName.GetPtr(), iLength);
   int32_t iStart = 0, iEnd = g_iXFAElementCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
     const XFA_ELEMENTINFO* pInfo = g_XFAElementData + iMid;
     if (uHash == pInfo->uHash) {
       return pInfo;
     } else if (uHash < pInfo->uHash) {
       iEnd = iMid - 1;
     } else {
       iStart = iMid + 1;
     }
   } while (iStart <= iEnd);
   return NULL;
 }
-const XFA_ELEMENTINFO* XFA_GetElementByID(XFA_ELEMENT eName) {
+const XFA_ELEMENTINFO* XFA_GetObjectByByID(XFA_ELEMENT eName) {

[dsinclair, 2016/03/29 20:45:25]

nit: ByBy

   return (eName < g_iXFAElementCount) ? (g_XFAElementData + eName) : NULL;
 }
-const uint16_t* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount) {
+const uint16_t* XFA_GetObjectByChildren(XFA_ELEMENT eElement, int32_t& iCount) {

[dsinclair, 2016/03/29 20:45:25]

nit: Do we want By here?

   if (eElement >= g_iXFAElementCount) {
     return NULL;
   }
   const XFA_ELEMENTHIERARCHY* pElement = g_XFAElementChildrenIndex + eElement;
   iCount = pElement->wCount;
   return g_XFAElementChildrenData + pElement->wStart;
 }
-const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount) {
+const uint8_t* XFA_GetObjectByAttributes(XFA_ELEMENT eElement,

[dsinclair, 2016/03/29 20:45:25]

ditto

+                                         int32_t& iCount) {
   if (eElement >= g_iXFAElementCount) {
     return NULL;
   }
   const XFA_ELEMENTHIERARCHY* pElement = g_XFAElementAttributeIndex + eElement;
   iCount = pElement->wCount;
   return g_XFAElementAttributeData + pElement->wStart;
 }
 const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement,
                                                    XFA_ATTRIBUTE eAttribute,
                                                    uint32_t dwPacket) {
   int32_t iCount = 0;
-  const uint8_t* pAttr = XFA_GetElementAttributes(eElement, iCount);
+  const uint8_t* pAttr = XFA_GetObjectByAttributes(eElement, iCount);
   if (pAttr == NULL || iCount < 1) {
     return NULL;
   }
   CFX_DSPATemplate<uint8_t> search;
   int32_t index = search.Lookup(eAttribute, pAttr, iCount);
   if (index < 0) {
     return NULL;
   }
   const XFA_ATTRIBUTEINFO* pInfo = XFA_GetAttributeByID(eAttribute);
   ASSERT(pInfo);
   if (dwPacket == XFA_XDPPACKET_UNKNOWN)
     return pInfo;
   return (dwPacket & pInfo->dwPackets) ? pInfo : NULL;
 }
 const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement,
                                              XFA_ELEMENT eChild,
                                              uint32_t dwPacket) {
   int32_t iCount = 0;
-  const uint16_t* pChild = XFA_GetElementChildren(eElement, iCount);
+  const uint16_t* pChild = XFA_GetObjectByChildren(eElement, iCount);
   if (pChild == NULL || iCount < 1) {
     return NULL;
   }
   CFX_DSPATemplate<uint16_t> search;
   int32_t index = search.Lookup(eChild, pChild, iCount);
   if (index < 0) {
     return NULL;
   }
-  const XFA_ELEMENTINFO* pInfo = XFA_GetElementByID(eChild);
+  const XFA_ELEMENTINFO* pInfo = XFA_GetObjectByByID(eChild);
   ASSERT(pInfo);
   if (dwPacket == XFA_XDPPACKET_UNKNOWN)
     return pInfo;
   return (dwPacket & pInfo->dwPackets) ? pInfo : NULL;
 }
-const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement,
-                                             int32_t& iCount) {
+const XFA_PROPERTY* XFA_GetObjectByProperties(XFA_ELEMENT eElement,
+                                              int32_t& iCount) {
   if (eElement >= g_iXFAElementCount) {
     return NULL;
   }
   const XFA_ELEMENTHIERARCHY* pElement = g_XFAElementPropertyIndex + eElement;
   iCount = pElement->wCount;
   return g_XFAElementPropertyData + pElement->wStart;
 }
 const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement,
                                              XFA_ELEMENT eProperty,
                                              uint32_t dwPacket) {
   int32_t iCount = 0;
-  const XFA_PROPERTY* pProperty = XFA_GetElementProperties(eElement, iCount);
+  const XFA_PROPERTY* pProperty = XFA_GetObjectByProperties(eElement, iCount);
   if (pProperty == NULL || iCount < 1) {
     return NULL;
   }
   int32_t iStart = 0, iEnd = iCount - 1, iMid;
   do {
     iMid = (iStart + iEnd) / 2;
     XFA_ELEMENT eName = (XFA_ELEMENT)pProperty[iMid].eName;
     if (eProperty == eName) {
       break;
     } else if (eProperty < eName) {
       iEnd = iMid - 1;
     } else {
       iStart = iMid + 1;
     }
   } while (iStart <= iEnd);
   if (iStart > iEnd) {
     return NULL;
   }
-  const XFA_ELEMENTINFO* pInfo = XFA_GetElementByID(eProperty);
+  const XFA_ELEMENTINFO* pInfo = XFA_GetObjectByByID(eProperty);
   ASSERT(pInfo);
   if (dwPacket == XFA_XDPPACKET_UNKNOWN)
     return pProperty + iMid;
   return (dwPacket & pInfo->dwPackets) ? (pProperty + iMid) : NULL;
 }
 const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_ELEMENT eElement,
                                                     XFA_ATTRIBUTE eAttribute,
                                                     XFA_ATTRIBUTETYPE eType) {
   int32_t iStart = 0, iEnd = g_iXFANotsureCount - 1;
   do {
@@ skipping 290 matching lines @@
   m_iPosition += iMaxLength;
   bEOS = IsEOF();
   return iMaxLength;
 }
 uint16_t CXFA_WideTextRead::GetCodePage() const {
   return (sizeof(FX_WCHAR) == 2) ? FX_CODEPAGE_UTF16LE : FX_CODEPAGE_UTF32LE;
 }
 uint16_t CXFA_WideTextRead::SetCodePage(uint16_t wCodePage) {
   return GetCodePage();
 }