Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: xfa/fxfa/app/xfa_checksum.cpp

Issue 1990003002: Move fgas_sax into individual files in fde. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fxfa/app/xfa_checksum.cpp
diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index 195033bfab8c85bde5be4330c2c6ffc5550fc1d3..98c217d40f2d63f66eca87b97e0fd2f942b8804f 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -15,16 +15,16 @@ CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext)
}
CXFA_SAXReaderHandler::~CXFA_SAXReaderHandler() {}
void* CXFA_SAXReaderHandler::OnTagEnter(const CFX_ByteStringC& bsTagName,
- FX_SAXNODE eType,
+ CFX_SaxNode eType,
uint32_t dwStartPos) {
UpdateChecksum(TRUE);
- if (eType != FX_SAXNODE_Tag && eType != FX_SAXNODE_Instruction) {
+ if (eType != CFX_SaxNode::Tag && eType != CFX_SaxNode::Instruction) {
return NULL;
}
m_SAXContext.m_eNode = eType;
CFX_ByteTextBuf& textBuf = m_SAXContext.m_TextBuf;
textBuf << "<";
- if (eType == FX_SAXNODE_Instruction) {
+ if (eType == CFX_SaxNode::Instruction) {
textBuf << "?";
}
textBuf << bsTagName;
@@ -49,18 +49,18 @@ void CXFA_SAXReaderHandler::OnTagBreak(void* pTag) {
UpdateChecksum(FALSE);
}
void CXFA_SAXReaderHandler::OnTagData(void* pTag,
- FX_SAXNODE eType,
+ CFX_SaxNode eType,
const CFX_ByteStringC& bsData,
uint32_t dwStartPos) {
if (pTag == NULL) {
return;
}
CFX_ByteTextBuf& textBuf = ((CXFA_SAXContext*)pTag)->m_TextBuf;
- if (eType == FX_SAXNODE_CharData) {
+ if (eType == CFX_SaxNode::CharData) {
textBuf << "<![CDATA[";
}
textBuf << bsData;
- if (eType == FX_SAXNODE_CharData) {
+ if (eType == CFX_SaxNode::CharData) {
textBuf << "]]>";
}
}
@@ -70,9 +70,9 @@ void CXFA_SAXReaderHandler::OnTagClose(void* pTag, uint32_t dwEndPos) {
}
CXFA_SAXContext* pSAXContext = (CXFA_SAXContext*)pTag;
CFX_ByteTextBuf& textBuf = pSAXContext->m_TextBuf;
- if (pSAXContext->m_eNode == FX_SAXNODE_Instruction) {
+ if (pSAXContext->m_eNode == CFX_SaxNode::Instruction) {
textBuf << "?>";
- } else if (pSAXContext->m_eNode == FX_SAXNODE_Tag) {
+ } else if (pSAXContext->m_eNode == CFX_SaxNode::Tag) {
textBuf << "></" << pSAXContext->m_bsTagName.AsStringC() << ">";
}
UpdateChecksum(FALSE);
@@ -88,13 +88,13 @@ void CXFA_SAXReaderHandler::OnTagEnd(void* pTag,
UpdateChecksum(FALSE);
}
void CXFA_SAXReaderHandler::OnTargetData(void* pTag,
- FX_SAXNODE eType,
+ CFX_SaxNode eType,
const CFX_ByteStringC& bsData,
uint32_t dwStartPos) {
- if (pTag == NULL && eType != FX_SAXNODE_Comment) {
+ if (pTag == NULL && eType != CFX_SaxNode::Comment) {
return;
}
- if (eType == FX_SAXNODE_Comment) {
+ if (eType == CFX_SaxNode::Comment) {
CFX_ByteTextBuf& textBuf = m_SAXContext.m_TextBuf;
textBuf << "<!--" << bsData << "-->";
UpdateChecksum(FALSE);
@@ -152,9 +152,9 @@ FX_BOOL CXFA_ChecksumContext::UpdateChecksum(IFX_FileRead* pSrcFile,
m_pSAXReader->SetHandler(&handler);
if (m_pSAXReader->StartParse(
pSrcFile, (uint32_t)offset, (uint32_t)size,
- FX_SAXPARSEMODE_NotSkipSpace | FX_SAXPARSEMODE_NotConvert_amp |
- FX_SAXPARSEMODE_NotConvert_lt | FX_SAXPARSEMODE_NotConvert_gt |
- FX_SAXPARSEMODE_NotConvert_sharp) < 0) {
+ CFX_SaxParseMode_NotSkipSpace | CFX_SaxParseMode_NotConvert_amp |
+ CFX_SaxParseMode_NotConvert_lt | CFX_SaxParseMode_NotConvert_gt |
+ CFX_SaxParseMode_NotConvert_sharp) < 0) {
return FALSE;
}
return m_pSAXReader->ContinueParse(NULL) > 99;

Powered by Google App Engine
This is Rietveld 408576698