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

xfa/fxfa/parser/xfa_parser_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_parser_imp.h"
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
@@ skipping 213 matching lines @@
       continue;
     }
     if (pNode->HasAttribute(wsNSAttribute)) {
       pNode->GetString(wsNSAttribute, wsNamespaceURI);
       return TRUE;
     }
   }
   wsNamespaceURI.Empty();
   return bRet;
 }
-static inline void XFA_FDEExtension_GetElementTagNamespaceURI(
+static inline void XFA_FDEExtension_GetObjectByTagNamespaceURI(

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

Do we want By here?

     IFDE_XMLElement* pElement,
     CFX_WideString& wsNamespaceURI) {
   CFX_WideString wsNodeStr;
   pElement->GetNamespacePrefix(wsNodeStr);
   if (!XFA_FDEExtension_ResolveNamespaceQualifier(pElement, wsNodeStr,
                                                   wsNamespaceURI)) {
     wsNamespaceURI.Empty();
   }
 }
 static FX_BOOL XFA_FDEExtension_MatchNodeName(
     IFDE_XMLNode* pNode,
     const CFX_WideStringC& wsLocalTagName,
     const CFX_WideStringC& wsNamespaceURIPrefix,
     uint32_t eMatchFlags = XFA_XDPPACKET_FLAGS_NOMATCH) {
   if (!pNode || pNode->GetType() != FDE_XMLNODE_Element) {
     return FALSE;
   }
   IFDE_XMLElement* pElement = reinterpret_cast<IFDE_XMLElement*>(pNode);
   CFX_WideString wsNodeStr;
   pElement->GetLocalTagName(wsNodeStr);
   if (wsNodeStr != wsLocalTagName) {
     return FALSE;
   }
-  XFA_FDEExtension_GetElementTagNamespaceURI(pElement, wsNodeStr);
+  XFA_FDEExtension_GetObjectByTagNamespaceURI(pElement, wsNodeStr);
   if (eMatchFlags & XFA_XDPPACKET_FLAGS_NOMATCH) {
     return TRUE;
   }
   if (eMatchFlags & XFA_XDPPACKET_FLAGS_PREFIXMATCH) {
     return wsNodeStr.Left(wsNamespaceURIPrefix.GetLength()) ==
            wsNamespaceURIPrefix;
   }
   return wsNodeStr == wsNamespaceURIPrefix;
 }
 static FX_BOOL XFA_FDEExtension_GetAttributeLocalName(
@@ skipping 554 matching lines @@
                                            FX_BOOL bUseAttribute) {
   FX_BOOL bOneOfPropertyFound = FALSE;
   for (IFDE_XMLNode* pXMLChild = pXMLDoc->GetNodeItem(IFDE_XMLNode::FirstChild);
        pXMLChild;
        pXMLChild = pXMLChild->GetNodeItem(IFDE_XMLNode::NextSibling)) {
     switch (pXMLChild->GetType()) {
       case FDE_XMLNODE_Element: {
         IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLChild;
         CFX_WideString wsTagName;
         pXMLElement->GetLocalTagName(wsTagName);
-        const XFA_ELEMENTINFO* pElemInfo = XFA_GetElementByName(wsTagName);
+        const XFA_ELEMENTINFO* pElemInfo = XFA_GetObjectByByName(wsTagName);
         if (!pElemInfo) {
           continue;
         }
         const XFA_PROPERTY* pPropertyInfo = XFA_GetPropertyOfElement(
             pXFANode->GetClassID(), pElemInfo->eName, ePacketID);
         if (pPropertyInfo &&
             ((pPropertyInfo->uFlags &
               (XFA_PROPERTYFLAG_OneOf | XFA_PROPERTYFLAG_DefaultOneOf)) != 0)) {
           if (bOneOfPropertyFound) {
             break;
@@ skipping 61 matching lines @@
         break;
       default:
         break;
     }
   }
   return pXFANode;
 }
 FX_BOOL XFA_RecognizeRichText(IFDE_XMLElement* pRichTextXMLNode) {
   if (pRichTextXMLNode) {
     CFX_WideString wsNamespaceURI;
-    XFA_FDEExtension_GetElementTagNamespaceURI(pRichTextXMLNode,
-                                               wsNamespaceURI);
+    XFA_FDEExtension_GetObjectByTagNamespaceURI(pRichTextXMLNode,
+                                                wsNamespaceURI);
     if (wsNamespaceURI == FX_WSTRC(L"http://www.w3.org/1999/xhtml")) {
       return TRUE;
     }
   }
   return FALSE;
 }
 class RichTextNodeVisitor {
  public:
   static inline IFDE_XMLNode* GetFirstChild(IFDE_XMLNode* pNode) {
     return pNode->GetNodeItem(IFDE_XMLNode::FirstChild);
@@ skipping 106 matching lines @@
                                        XFA_XDPPACKET ePacketID) {
   for (IFDE_XMLNode* pXMLChild =
            pXMLNode->GetNodeItem(IFDE_XMLNode::FirstChild);
        pXMLChild;
        pXMLChild = pXMLChild->GetNodeItem(IFDE_XMLNode::NextSibling)) {
     switch (pXMLChild->GetType()) {
       case FDE_XMLNODE_Element: {
         IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLChild;
         {
           CFX_WideString wsNamespaceURI;
-          XFA_FDEExtension_GetElementTagNamespaceURI(pXMLElement,
-                                                     wsNamespaceURI);
+          XFA_FDEExtension_GetObjectByTagNamespaceURI(pXMLElement,
+                                                      wsNamespaceURI);
           if (wsNamespaceURI ==
                   FX_WSTRC(L"http://www.xfa.com/schema/xfa-package/") ||
               wsNamespaceURI ==
                   FX_WSTRC(L"http://www.xfa.org/schema/xfa-package/") ||
               wsNamespaceURI ==
                   FX_WSTRC(L"http://www.w3.org/2001/XMLSchema-instance")) {
             continue;
           }
           if (0) {
             continue;
@@ skipping 504 matching lines @@
       break;
     }
     if (pPause && iCount > 500 && pPause->NeedToPauseNow()) {
       break;
     }
   }
   return (m_dwStatus == FDE_XMLSYNTAXSTATUS_Error || m_NodeStack.GetSize() != 1)
              ? -1
              : m_pParser->GetStatus();
 }