Move fgas_sax into individual files in fde.

xfa/fde/xml/cfx_saxreader.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/fgas/xml/fgas_sax.h"
+#include "xfa/fde/xml/cfx_saxreader.h"
 
 #include <algorithm>
 
 #include "xfa/fxfa/include/xfa_checksum.h"
 
+enum class CFX_SaxMode {
+  Text = 0,
+  NodeStart,
+  DeclOrComment,
+  DeclNode,
+  Comment,
+  CommentContent,
+  TagName,
+  TagAttributeName,
+  TagAttributeEqual,
+  TagAttributeValue,
+  TagMaybeClose,
+  TagClose,
+  TagEnd,
+  TargetData,
+  MAX
+};
+
+class CFX_SAXItem {
+ public:
+  CFX_SAXItem()
+      : m_pNode(NULL),

[Tom Sepez, 2016/05/18 20:14:12]

nit: nullptrs

[dsinclair, 2016/05/18 20:24:52]

Done.

+        m_eNode(CFX_SaxNode::Unknown),
+        m_dwID(0),
+        m_bSkip(FALSE),
+        m_pPrev(NULL),
+        m_pNext(NULL) {}
+  void* m_pNode;

[Tom Sepez, 2016/05/18 20:14:12]

nit: blank line before

[dsinclair, 2016/05/18 20:24:52]

Done.

+  CFX_SaxNode m_eNode;
+  uint32_t m_dwID;
+  FX_BOOL m_bSkip;
+  CFX_SAXItem* m_pPrev;
+  CFX_SAXItem* m_pNext;
+};
+
+class CFX_SAXCommentContext {
+ public:
+  CFX_SAXCommentContext() : m_iHeaderCount(0), m_iTailCount(0) {}
+  int32_t m_iHeaderCount;
+  int32_t m_iTailCount;
+};
+
 namespace {
 
 const uint32_t kSaxFileBufSize = 32768;
 
+typedef void (CFX_SAXReader::*FX_SAXReader_LPFParse)();
+static const FX_SAXReader_LPFParse
+    g_FX_SAXReader_LPFParse[static_cast<int>(CFX_SaxMode::MAX)] = {
+        &CFX_SAXReader::ParseText,
+        &CFX_SAXReader::ParseNodeStart,
+        &CFX_SAXReader::ParseDeclOrComment,
+        &CFX_SAXReader::ParseDeclNode,
+        &CFX_SAXReader::ParseComment,
+        &CFX_SAXReader::ParseCommentContent,
+        &CFX_SAXReader::ParseTagName,
+        &CFX_SAXReader::ParseTagAttributeName,
+        &CFX_SAXReader::ParseTagAttributeEqual,
+        &CFX_SAXReader::ParseTagAttributeValue,
+        &CFX_SAXReader::ParseMaybeClose,
+        &CFX_SAXReader::ParseTagClose,
+        &CFX_SAXReader::ParseTagEnd,
+        &CFX_SAXReader::ParseTargetData,
+};
+
 }  // namespace
 
 CFX_SAXFile::CFX_SAXFile()
     : m_pFile(NULL),
       m_dwStart(0),
       m_dwEnd(0),
       m_dwCur(0),
       m_pBuf(NULL),
       m_dwBufSize(0),
       m_dwBufIndex(0) {}
@@ skipping 131 matching lines @@
     return;
   }
   if (m_iNameSize <= 1024 * 1024) {
     m_iNameSize *= 2;
   } else {
     m_iNameSize += 1024 * 1024;
   }
   m_pszName = (uint8_t*)FX_Realloc(uint8_t, m_pszName, m_iNameSize);
 }
 inline FX_BOOL CFX_SAXReader::SkipSpace(uint8_t ch) {
-  return (m_dwParseMode & FX_SAXPARSEMODE_NotSkipSpace) == 0 && ch < 0x21;
+  return (m_dwParseMode & CFX_SaxParseMode_NotSkipSpace) == 0 && ch < 0x21;
 }
 int32_t CFX_SAXReader::StartParse(IFX_FileRead* pFile,
                                   uint32_t dwStart,
                                   uint32_t dwLen,
                                   uint32_t dwParseMode) {
   m_iState = -1;
   Reset();
   if (!m_File.StartFile(pFile, dwStart, dwLen)) {
     return -1;
   }
   m_iState = 0;
-  m_eMode = FX_SAXMODE_Text;
-  m_ePrevMode = FX_SAXMODE_Text;
+  m_eMode = CFX_SaxMode::Text;
+  m_ePrevMode = CFX_SaxMode::Text;
   m_bCharData = FALSE;
   m_dwDataOffset = 0;
   m_pRoot = m_pCurItem = new CFX_SAXItem;
   m_pCurItem->m_dwID = ++m_dwItemID;
   m_dwParseMode = dwParseMode;
   return 0;
 }
-typedef void (CFX_SAXReader::*FX_SAXReader_LPFParse)();
-static const FX_SAXReader_LPFParse g_FX_SAXReader_LPFParse[FX_SAXMODE_MAX] = {
-    &CFX_SAXReader::ParseText,
-    &CFX_SAXReader::ParseNodeStart,
-    &CFX_SAXReader::ParseDeclOrComment,
-    &CFX_SAXReader::ParseDeclNode,
-    &CFX_SAXReader::ParseComment,
-    &CFX_SAXReader::ParseCommentContent,
-    &CFX_SAXReader::ParseTagName,
-    &CFX_SAXReader::ParseTagAttributeName,
-    &CFX_SAXReader::ParseTagAttributeEqual,
-    &CFX_SAXReader::ParseTagAttributeValue,
-    &CFX_SAXReader::ParseMaybeClose,
-    &CFX_SAXReader::ParseTagClose,
-    &CFX_SAXReader::ParseTagEnd,
-    &CFX_SAXReader::ParseTargetData,
-};
+
 int32_t CFX_SAXReader::ContinueParse(IFX_Pause* pPause) {
   if (m_iState < 0 || m_iState > 99) {
     return m_iState;
   }
   while (m_File.m_dwCur < m_File.m_dwEnd) {
     uint32_t& index = m_File.m_dwBufIndex;
     uint32_t size = m_File.m_dwBufSize;
     const uint8_t* pBuf = m_File.m_pBuf;
     while (index < size) {
       m_CurByte = pBuf[index];
-      (this->*g_FX_SAXReader_LPFParse[m_eMode])();
+      (this->*g_FX_SAXReader_LPFParse[static_cast<int>(m_eMode)])();
       index++;
     }
     m_File.m_dwCur += index;
     m_iState = (m_File.m_dwCur - m_File.m_dwStart) * 100 /
                (m_File.m_dwEnd - m_File.m_dwStart);
     if (m_File.m_dwCur >= m_File.m_dwEnd) {
       break;
     }
     if (!m_File.ReadNextBlock()) {
       m_iState = -2;
       break;
     }
     m_dwDataOffset = 0;
     if (pPause && pPause->NeedToPauseNow()) {
       break;
     }
   }
   return m_iState;
 }
 void CFX_SAXReader::ParseChar(uint8_t ch) {
   ReallocDataBuffer();
   m_pszData[m_iDataPos] = ch;
   if (m_iEntityStart > -1 && ch == ';') {
     int32_t iSaveEntityStart = m_iEntityStart;
     CFX_ByteString csEntity(m_pszData + m_iEntityStart + 1,
                             m_iDataPos - m_iEntityStart - 1);
     int32_t iLen = csEntity.GetLength();
     if (iLen > 0) {
       if (csEntity[0] == '#') {
-        if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_sharp) == 0) {
+        if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_sharp) == 0) {
           ch = 0;
           uint8_t w;
           if (iLen > 1 && csEntity[1] == 'x') {
             for (int32_t i = 2; i < iLen; i++) {
               w = csEntity[i];
               if (w >= '0' && w <= '9') {
                 ch = (ch << 4) + w - '0';
               } else if (w >= 'A' && w <= 'F') {
                 ch = (ch << 4) + w - 55;
               } else if (w >= 'a' && w <= 'f') {
@@ skipping 10 matching lines @@
               }
               ch = ch * 10 + w - '0';
             }
           }
           if (ch != 0) {
             m_pszData[m_iEntityStart++] = ch;
           }
         }
       } else {
         if (csEntity.Compare("amp") == 0) {
-          if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_amp) == 0) {
+          if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_amp) == 0) {
             m_pszData[m_iEntityStart++] = '&';
           }
         } else if (csEntity.Compare("lt") == 0) {
-          if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_lt) == 0) {
+          if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_lt) == 0) {
             m_pszData[m_iEntityStart++] = '<';
           }
         } else if (csEntity.Compare("gt") == 0) {
-          if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_gt) == 0) {
+          if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_gt) == 0) {
             m_pszData[m_iEntityStart++] = '>';
           }
         } else if (csEntity.Compare("apos") == 0) {
-          if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_apos) == 0) {
+          if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_apos) == 0) {
             m_pszData[m_iEntityStart++] = '\'';
           }
         } else if (csEntity.Compare("quot") == 0) {
-          if ((m_dwParseMode & FX_SAXPARSEMODE_NotConvert_quot) == 0) {
+          if ((m_dwParseMode & CFX_SaxParseMode_NotConvert_quot) == 0) {
             m_pszData[m_iEntityStart++] = '\"';
           }
         }
       }
     }
     if (iSaveEntityStart != m_iEntityStart) {
       m_iDataPos = m_iEntityStart;
       m_iEntityStart = -1;
     } else {
       m_iDataPos++;
@@ skipping 10 matching lines @@
   if (m_CurByte == '<') {
     if (m_iDataPos > 0) {
       m_iDataLength = m_iDataPos;
       m_iDataPos = 0;
       if (m_pHandler) {
         NotifyData();
       }
     }
     Push();
     m_dwNodePos = m_File.m_dwCur + m_File.m_dwBufIndex;
-    m_eMode = FX_SAXMODE_NodeStart;
+    m_eMode = CFX_SaxMode::NodeStart;
     return;
   }
   if (m_iDataPos < 1 && SkipSpace(m_CurByte)) {
     return;
   }
   ParseChar(m_CurByte);
 }
 void CFX_SAXReader::ParseNodeStart() {
   if (m_CurByte == '?') {
-    m_pCurItem->m_eNode = FX_SAXNODE_Instruction;
-    m_eMode = FX_SAXMODE_TagName;
+    m_pCurItem->m_eNode = CFX_SaxNode::Instruction;
+    m_eMode = CFX_SaxMode::TagName;
     return;
   }
   if (m_CurByte == '!') {
-    m_eMode = FX_SAXMODE_DeclOrComment;
+    m_eMode = CFX_SaxMode::DeclOrComment;
     return;
   }
   if (m_CurByte == '/') {
-    m_eMode = FX_SAXMODE_TagEnd;
+    m_eMode = CFX_SaxMode::TagEnd;
     return;
   }
   if (m_CurByte == '>') {
     Pop();
-    m_eMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::Text;
     return;
   }
   if (m_CurByte > 0x20) {
     m_dwDataOffset = m_File.m_dwBufIndex;
-    m_pCurItem->m_eNode = FX_SAXNODE_Tag;
-    m_eMode = FX_SAXMODE_TagName;
+    m_pCurItem->m_eNode = CFX_SaxNode::Tag;
+    m_eMode = CFX_SaxMode::TagName;
     AppendData(m_CurByte);
   }
 }
 void CFX_SAXReader::ParseDeclOrComment() {
   if (m_CurByte == '-') {
-    m_eMode = FX_SAXMODE_Comment;
-    m_pCurItem->m_eNode = FX_SAXNODE_Comment;
+    m_eMode = CFX_SaxMode::Comment;
+    m_pCurItem->m_eNode = CFX_SaxNode::Comment;
     if (m_pCommentContext == NULL) {
       m_pCommentContext = new CFX_SAXCommentContext;
     }
     m_pCommentContext->m_iHeaderCount = 1;
     m_pCommentContext->m_iTailCount = 0;
   } else {
-    m_eMode = FX_SAXMODE_DeclNode;
+    m_eMode = CFX_SaxMode::DeclNode;
     m_dwDataOffset = m_File.m_dwBufIndex;
     m_SkipChar = '>';
     m_SkipStack.Add('>');
     SkipNode();
   }
 }
 void CFX_SAXReader::ParseComment() {
   m_pCommentContext->m_iHeaderCount = 2;
   m_dwNodePos = m_File.m_dwCur + m_File.m_dwBufIndex;
-  m_eMode = FX_SAXMODE_CommentContent;
+  m_eMode = CFX_SaxMode::CommentContent;
 }
 void CFX_SAXReader::ParseCommentContent() {
   if (m_CurByte == '-') {
     m_pCommentContext->m_iTailCount++;
   } else if (m_CurByte == '>' && m_pCommentContext->m_iTailCount == 2) {
     m_iDataLength = m_iDataPos;
     m_iDataPos = 0;
     if (m_pHandler) {
       NotifyTargetData();
     }
     Pop();
-    m_eMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::Text;
   } else {
     while (m_pCommentContext->m_iTailCount > 0) {
       AppendData('-');
       m_pCommentContext->m_iTailCount--;
     }
     AppendData(m_CurByte);
   }
 }
 void CFX_SAXReader::ParseDeclNode() {
   SkipNode();
 }
 void CFX_SAXReader::ParseTagName() {
   if (m_CurByte < 0x21 || m_CurByte == '/' || m_CurByte == '>' ||
       m_CurByte == '?') {
     m_iDataLength = m_iDataPos;
     m_iDataPos = 0;
     if (m_pHandler) {
       NotifyEnter();
     }
     if (m_CurByte < 0x21) {
-      m_eMode = FX_SAXMODE_TagAttributeName;
+      m_eMode = CFX_SaxMode::TagAttributeName;
     } else if (m_CurByte == '/' || m_CurByte == '?') {
       m_ePrevMode = m_eMode;
-      m_eMode = FX_SAXMODE_TagMaybeClose;
+      m_eMode = CFX_SaxMode::TagMaybeClose;
     } else {
       if (m_pHandler) {
         NotifyBreak();
       }
-      m_eMode = FX_SAXMODE_Text;
+      m_eMode = CFX_SaxMode::Text;
     }
   } else {
     AppendData(m_CurByte);
   }
 }
 void CFX_SAXReader::ParseTagAttributeName() {
   if (m_CurByte < 0x21 || m_CurByte == '=') {
     if (m_iDataPos < 1 && m_CurByte < 0x21) {
       return;
     }
     m_iNameLength = m_iDataPos;
     m_iDataPos = 0;
     m_SkipChar = 0;
-    m_eMode = m_CurByte == '=' ? FX_SAXMODE_TagAttributeValue
-                               : FX_SAXMODE_TagAttributeEqual;
+    m_eMode = m_CurByte == '=' ? CFX_SaxMode::TagAttributeValue
+                               : CFX_SaxMode::TagAttributeEqual;
     return;
   }
   if (m_CurByte == '/' || m_CurByte == '>' || m_CurByte == '?') {
     if (m_CurByte == '/' || m_CurByte == '?') {
       m_ePrevMode = m_eMode;
-      m_eMode = FX_SAXMODE_TagMaybeClose;
+      m_eMode = CFX_SaxMode::TagMaybeClose;
     } else {
       if (m_pHandler) {
         NotifyBreak();
       }
-      m_eMode = FX_SAXMODE_Text;
+      m_eMode = CFX_SaxMode::Text;
     }
     return;
   }
   if (m_iDataPos < 1) {
     m_dwDataOffset = m_File.m_dwBufIndex;
   }
   AppendName(m_CurByte);
 }
 void CFX_SAXReader::ParseTagAttributeEqual() {
   if (m_CurByte == '=') {
     m_SkipChar = 0;
-    m_eMode = FX_SAXMODE_TagAttributeValue;
+    m_eMode = CFX_SaxMode::TagAttributeValue;
     return;
-  } else if (m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+  } else if (m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
     m_iDataPos = m_iNameLength;
     AppendName(0x20);
-    m_eMode = FX_SAXMODE_TargetData;
+    m_eMode = CFX_SaxMode::TargetData;
     ParseTargetData();
   }
 }
 void CFX_SAXReader::ParseTagAttributeValue() {
   if (m_SkipChar) {
     if (m_SkipChar == m_CurByte) {
       {
         m_iDataLength = m_iDataPos;
         m_iDataPos = 0;
         if (m_pHandler) {
           NotifyAttribute();
         }
       }
       m_SkipChar = 0;
-      m_eMode = FX_SAXMODE_TagAttributeName;
+      m_eMode = CFX_SaxMode::TagAttributeName;
       return;
     }
     ParseChar(m_CurByte);
     return;
   }
   if (m_CurByte < 0x21) {
     return;
   }
   if (m_iDataPos < 1) {
     if (m_CurByte == '\'' || m_CurByte == '\"') {
       m_SkipChar = m_CurByte;
     }
   }
 }
 void CFX_SAXReader::ParseMaybeClose() {
   if (m_CurByte == '>') {
-    if (m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+    if (m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
       m_iNameLength = m_iDataPos;
       m_iDataPos = 0;
       if (m_pHandler) {
         NotifyTargetData();
       }
     }
     ParseTagClose();
-    m_eMode = FX_SAXMODE_Text;
-  } else if (m_ePrevMode == FX_SAXMODE_TagName) {
+    m_eMode = CFX_SaxMode::Text;
+  } else if (m_ePrevMode == CFX_SaxMode::TagName) {
     AppendData('/');
-    m_eMode = FX_SAXMODE_TagName;
-    m_ePrevMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::TagName;
+    m_ePrevMode = CFX_SaxMode::Text;
     ParseTagName();
-  } else if (m_ePrevMode == FX_SAXMODE_TagAttributeName) {
+  } else if (m_ePrevMode == CFX_SaxMode::TagAttributeName) {
     AppendName('/');
-    m_eMode = FX_SAXMODE_TagAttributeName;
-    m_ePrevMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::TagAttributeName;
+    m_ePrevMode = CFX_SaxMode::Text;
     ParseTagAttributeName();
-  } else if (m_ePrevMode == FX_SAXMODE_TargetData) {
+  } else if (m_ePrevMode == CFX_SaxMode::TargetData) {
     AppendName('?');
-    m_eMode = FX_SAXMODE_TargetData;
-    m_ePrevMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::TargetData;
+    m_ePrevMode = CFX_SaxMode::Text;
     ParseTargetData();
   }
 }
 void CFX_SAXReader::ParseTagClose() {
   m_dwNodePos = m_File.m_dwCur + m_File.m_dwBufIndex;
   if (m_pHandler) {
     NotifyClose();
   }
   Pop();
 }
 void CFX_SAXReader::ParseTagEnd() {
   if (m_CurByte < 0x21) {
     return;
   }
   if (m_CurByte == '>') {
     Pop();
     m_dwNodePos = m_File.m_dwCur + m_File.m_dwBufIndex;
     m_iDataLength = m_iDataPos;
     m_iDataPos = 0;
     if (m_pHandler) {
       NotifyEnd();
     }
     Pop();
-    m_eMode = FX_SAXMODE_Text;
+    m_eMode = CFX_SaxMode::Text;
   } else {
     ParseChar(m_CurByte);
   }
 }
 void CFX_SAXReader::ParseTargetData() {
   if (m_CurByte == '?') {
     m_ePrevMode = m_eMode;
-    m_eMode = FX_SAXMODE_TagMaybeClose;
+    m_eMode = CFX_SaxMode::TagMaybeClose;
   } else {
     AppendName(m_CurByte);
   }
 }
 void CFX_SAXReader::SkipNode() {
   int32_t iLen = m_SkipStack.GetSize();
   if (m_SkipChar == '\'' || m_SkipChar == '\"') {
     if (m_CurByte != m_SkipChar) {
       return;
     }
@@ skipping 42 matching lines @@
             FXSYS_memmove(m_pszData, m_pszData + 7,
                           m_iDataLength * sizeof(uint8_t));
             m_bCharData = TRUE;
             if (m_pHandler) {
               NotifyData();
             }
             m_bCharData = FALSE;
           } else {
             Pop();
           }
-          m_eMode = FX_SAXMODE_Text;
+          m_eMode = CFX_SaxMode::Text;
         }
       }
       break;
   }
   if (iLen > 0) {
     ParseChar(m_CurByte);
   }
 }
 
 void CFX_SAXReader::NotifyData() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Tag)
-    m_pHandler->OnTagData(m_pCurItem->m_pNode,
-                          m_bCharData ? FX_SAXNODE_CharData : FX_SAXNODE_Text,
-                          CFX_ByteStringC(m_pszData, m_iDataLength),
-                          m_File.m_dwCur + m_dwDataOffset);
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Tag)
+    m_pHandler->OnTagData(
+        m_pCurItem->m_pNode,
+        m_bCharData ? CFX_SaxNode::CharData : CFX_SaxNode::Text,
+        CFX_ByteStringC(m_pszData, m_iDataLength),
+        m_File.m_dwCur + m_dwDataOffset);
 }
 
 void CFX_SAXReader::NotifyEnter() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Tag ||
-      m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Tag ||
+      m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
     m_pCurItem->m_pNode =
         m_pHandler->OnTagEnter(CFX_ByteStringC(m_pszData, m_iDataLength),
                                m_pCurItem->m_eNode, m_dwNodePos);
   }
 }
 
 void CFX_SAXReader::NotifyAttribute() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Tag ||
-      m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Tag ||
+      m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
     m_pHandler->OnTagAttribute(m_pCurItem->m_pNode,
                                CFX_ByteStringC(m_pszName, m_iNameLength),
                                CFX_ByteStringC(m_pszData, m_iDataLength));
   }
 }
 
 void CFX_SAXReader::NotifyBreak() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Tag)
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Tag)
     m_pHandler->OnTagBreak(m_pCurItem->m_pNode);
 }
 
 void CFX_SAXReader::NotifyClose() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Tag ||
-      m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Tag ||
+      m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
     m_pHandler->OnTagClose(m_pCurItem->m_pNode, m_dwNodePos);
   }
 }
 
 void CFX_SAXReader::NotifyEnd() {
-  if (m_pCurItem->m_eNode != FX_SAXNODE_Tag)
+  if (m_pCurItem->m_eNode != CFX_SaxNode::Tag)
     return;
 
   m_pHandler->OnTagEnd(m_pCurItem->m_pNode,
                        CFX_ByteStringC(m_pszData, m_iDataLength), m_dwNodePos);
 }
 
 void CFX_SAXReader::NotifyTargetData() {
-  if (m_pCurItem->m_eNode == FX_SAXNODE_Instruction) {
+  if (m_pCurItem->m_eNode == CFX_SaxNode::Instruction) {
     m_pHandler->OnTargetData(m_pCurItem->m_pNode, m_pCurItem->m_eNode,
                              CFX_ByteStringC(m_pszName, m_iNameLength),
                              m_dwNodePos);
-  } else if (m_pCurItem->m_eNode == FX_SAXNODE_Comment) {
+  } else if (m_pCurItem->m_eNode == CFX_SaxNode::Comment) {
     m_pHandler->OnTargetData(m_pCurItem->m_pNode, m_pCurItem->m_eNode,
                              CFX_ByteStringC(m_pszData, m_iDataLength),
                              m_dwNodePos);
   }
 }
 
 void CFX_SAXReader::SkipCurrentNode() {
   if (!m_pCurItem)
     return;
 
   m_pCurItem->m_bSkip = TRUE;
 }
 
 void CFX_SAXReader::SetHandler(CXFA_SAXReaderHandler* pHandler) {
   m_pHandler = pHandler;
 }