summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-19 15:18:13 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-19 15:18:13 -0800
commit4a2aa1a90d89b88036b0bff432ffefa183ea80d0 (patch)
treebd4f086e4a2371dd5bb283cd8df6ae7f01bb6dac
parent833d705688d21402357ef1ab40f4706dbadfb79a (diff)
downloadpdfium-chromium/2628.tar.xz
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1581823002 .
-rw-r--r--BUILD.gn4
-rw-r--r--xfa.gyp4
-rw-r--r--xfa/src/fdp/include/fde_xml.h8
-rw-r--r--xfa/src/fdp/src/xml/fde_xml_imp.cpp (renamed from xfa/src/fdp/src/xml/fde_xml.cpp)5
-rw-r--r--xfa/src/fdp/src/xml/fde_xml_imp.h (renamed from xfa/src/fdp/src/xml/fde_xml.h)8
5 files changed, 16 insertions, 13 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 487b604840..88619bd536 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -887,8 +887,8 @@ if (pdf_enable_xfa) {
"xfa/src/fdp/src/fde/fde_render.h",
"xfa/src/fdp/src/tto/fde_textout.cpp",
"xfa/src/fdp/src/tto/fde_textout.h",
- "xfa/src/fdp/src/xml/fde_xml.cpp",
- "xfa/src/fdp/src/xml/fde_xml.h",
+ "xfa/src/fdp/src/xml/fde_xml_imp.cpp",
+ "xfa/src/fdp/src/xml/fde_xml_imp.h",
"xfa/src/fee/include/fx_wordbreak.h",
"xfa/src/fee/include/ifde_txtedtbuf.h",
"xfa/src/fee/include/ifde_txtedtengine.h",
diff --git a/xfa.gyp b/xfa.gyp
index 810464e7ee..8e1ddec9fe 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -134,8 +134,8 @@
"xfa/src/fdp/src/fde/fde_render.h",
"xfa/src/fdp/src/tto/fde_textout.cpp",
"xfa/src/fdp/src/tto/fde_textout.h",
- "xfa/src/fdp/src/xml/fde_xml.cpp",
- "xfa/src/fdp/src/xml/fde_xml.h",
+ "xfa/src/fdp/src/xml/fde_xml_imp.cpp",
+ "xfa/src/fdp/src/xml/fde_xml_imp.h",
"xfa/src/fee/include/fx_wordbreak.h",
"xfa/src/fee/include/ifde_txtedtbuf.h",
"xfa/src/fee/include/ifde_txtedtengine.h",
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index 9fc80b789d..85793aae19 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FDE_XML
-#define _FDE_XML
+#ifndef FDE_XML_H_
+#define FDE_XML_H_
+
class IFDE_XMLNode;
class IFDE_XMLInstruction;
class IFDE_XMLDeclaration;
@@ -228,4 +229,5 @@ class IFDE_XMLSyntaxParser {
virtual void GetTextData(CFX_WideString& wsText) const = 0;
virtual void GetTargetData(CFX_WideString& wsData) const = 0;
};
-#endif
+
+#endif // FDE_XML_H_
diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
index 8725cb7655..6961aba6f8 100644
--- a/xfa/src/fdp/src/xml/fde_xml.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
@@ -7,7 +7,7 @@
#include <algorithm>
#include "xfa/src/foxitlib.h"
-#include "fde_xml.h"
+#include "fde_xml_imp.h"
#ifdef __cplusplus
extern "C" {
#endif
@@ -1320,8 +1320,7 @@ CFDE_BlockBuffer::CFDE_BlockBuffer(int32_t iAllocStep)
: m_iDataLength(0),
m_iBufferSize(0),
m_iAllocStep(iAllocStep),
- m_iStartPosition(0) {
-}
+ m_iStartPosition(0) {}
CFDE_BlockBuffer::~CFDE_BlockBuffer() {
ClearBuffer();
}
diff --git a/xfa/src/fdp/src/xml/fde_xml.h b/xfa/src/fdp/src/xml/fde_xml_imp.h
index fb5ea6f44b..1a8097008e 100644
--- a/xfa/src/fdp/src/xml/fde_xml.h
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FDE_XML_IMP
-#define _FDE_XML_IMP
+#ifndef FDE_XML_IMP_H_
+#define FDE_XML_IMP_H_
+
#define _FDE_BLOCK_BUFFER
#ifdef _FDE_BLOCK_BUFFER
class CFDE_BlockBuffer;
@@ -370,4 +371,5 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target {
void GetData(CFX_WideString& wsData) const;
#endif
};
-#endif
+
+#endif // FDE_XML_IMP_H_