Rename fpdfsdk/fpdfxfa files to match contentschromium/2881

Each of these files contains a single class, rename the file to match the internal class name. Review-Url: https://codereview.chromium.org/2385423004
author: dsinclair <dsinclair@chromium.org> 2016-10-04 14:02:47 -0700
committer: Commit bot <commit-bot@chromium.org> 2016-10-04 14:02:47 -0700
commit: 4d29e78fc80285d222f2bad916354e3db970d0cc (patch)
tree: 09b66b68a4a29f50a9c20ef079148b920ef29ff5
parent: 98151cab3d24c021597d1fb075437675a3db7e12 (diff)
download: pdfium-chromium/2881.tar.xz
28 files changed, 63 insertions, 63 deletions
diff --git a/BUILD.gn b/BUILD.gn
index df1511ce2d..57a0cfb9d4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1049,16 +1049,16 @@ if (pdf_enable_v8) {
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
+      "fpdfsdk/fpdfxfa/cpdfxfa_app.cpp",
+      "fpdfsdk/fpdfxfa/cpdfxfa_app.h",
       "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp",
       "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h",
-      "fpdfsdk/fpdfxfa/fpdfxfa_app.cpp",
-      "fpdfsdk/fpdfxfa/fpdfxfa_app.h",
-      "fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp",
-      "fpdfsdk/fpdfxfa/fpdfxfa_doc.h",
-      "fpdfsdk/fpdfxfa/fpdfxfa_page.cpp",
-      "fpdfsdk/fpdfxfa/fpdfxfa_page.h",
-      "fpdfsdk/fpdfxfa/fpdfxfa_util.cpp",
-      "fpdfsdk/fpdfxfa/fpdfxfa_util.h",
+      "fpdfsdk/fpdfxfa/cpdfxfa_document.cpp",
+      "fpdfsdk/fpdfxfa/cpdfxfa_document.h",
+      "fpdfsdk/fpdfxfa/cpdfxfa_page.cpp",
+      "fpdfsdk/fpdfxfa/cpdfxfa_page.h",
+      "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp",
+      "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h",
     ]
     deps = [
       ":fxcrt",
diff --git a/fpdfsdk/cpdfsdk_annot.cpp b/fpdfsdk/cpdfsdk_annot.cpp
index f42da24475..aa545373d4 100644
--- a/fpdfsdk/cpdfsdk_annot.cpp
+++ b/fpdfsdk/cpdfsdk_annot.cpp
@@ -12,7 +12,7 @@
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 namespace {
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 0fac080886..32ff8d635e 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -19,7 +19,7 @@
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/cpdfsdk_xfawidgethandler.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 #endif  // PDF_ENABLE_XFA
diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp
index c22ee4a76e..a9e24fb71a 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.cpp
+++ b/fpdfsdk/cpdfsdk_baannothandler.cpp
@@ -18,7 +18,7 @@
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 namespace {
diff --git a/fpdfsdk/cpdfsdk_environment.cpp b/fpdfsdk/cpdfsdk_environment.cpp
index df0ba06167..1c84b8c194 100644
--- a/fpdfsdk/cpdfsdk_environment.cpp
+++ b/fpdfsdk/cpdfsdk_environment.cpp
@@ -16,7 +16,7 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
 #endif  // PDF_ENABLE_XFA
 
 namespace {
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index bc6f2d30fb..a312ce944f 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -38,8 +38,8 @@
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/cpdfsdk_xfawidget.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 529265e88f..921e4a396b 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -21,7 +21,7 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
 #include "xfa/fxfa/xfa_ffwidgethandler.h"
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 412f040e19..13b412c5e5 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -31,7 +31,7 @@
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/fxfa_widget.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index 2d36fb18a4..d54ea92833 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -21,7 +21,7 @@
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 CPDFSDK_WidgetHandler::CPDFSDK_WidgetHandler(CPDFSDK_Environment* pEnv)
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
index f21f4d2af9..04486fcbdc 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
@@ -13,7 +13,7 @@
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_xfawidget.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #include "xfa/fwl/core/fwl_widgethit.h"
 #include "xfa/fxfa/fxfa_basic.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index 432e91853a..6b0a3861f9 100644
--- a/fpdfsdk/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
@@ -21,7 +21,7 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 FX_BOOL FPDF_UnSupportError(int nError) {
diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp
index ef976775fe..fc85404dba 100644
--- a/fpdfsdk/fpdfdoc_unittest.cpp
+++ b/fpdfsdk/fpdfdoc_unittest.cpp
@@ -19,8 +19,8 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 class CPDF_TestDocument : public CPDF_Document {
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 861e14ed66..78790f7ce6 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -29,9 +29,9 @@
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #endif  // PDF_ENABLE_XFA
 
 #if _FX_OS_ == _FX_ANDROID_
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index a613600443..6fea1af42b 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
@@ -28,9 +28,9 @@
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 72cba11426..364f4d2d6f 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -19,9 +19,9 @@
 #include "public/fpdf_edit.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "public/fpdf_formfill.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/xfa_checksum.h"
diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp
index 4244a2dd96..4282350786 100644
--- a/fpdfsdk/fpdftext.cpp
+++ b/fpdfsdk/fpdftext.cpp
@@ -16,8 +16,8 @@
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #endif  // PDF_ENABLE_XFA
 
 #ifdef _WIN32
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index dfd15ed5df..001ebb0dc5 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -36,10 +36,10 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "public/fpdf_formfill.h"
 #endif  // PDF_ENABLE_XFA
 
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
index 4edfcf0676..14450a10ab 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
 
 #include <memory>
 
 #include "fpdfsdk/cpdfsdk_environment.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxbarcode/BC_Library.h"
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/cpdfxfa_app.h
index 59cb220cee..3830dc4d4c 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_app.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FPDFXFA_FPDFXFA_APP_H_
-#define FPDFSDK_FPDFXFA_FPDFXFA_APP_H_
+#ifndef FPDFSDK_FPDFXFA_CPDFXFA_APP_H_
+#define FPDFSDK_FPDFXFA_CPDFXFA_APP_H_
 
 #include "xfa/fxfa/fxfa.h"
 
@@ -76,4 +76,4 @@ class CPDFXFA_App : public IXFA_AppProvider {
   CFX_WideString m_csAppType;
 };
 
-#endif  // FPDFSDK_FPDFXFA_FPDFXFA_APP_H_
+#endif  // FPDFSDK_FPDFXFA_CPDFXFA_APP_H_
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 3910a701ce..1b27e16551 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -13,8 +13,8 @@
 #include "fpdfsdk/cpdfsdk_environment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "fpdfsdk/javascript/ijs_runtime.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
index a49a2708ef..e49cfde8c4 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 
 #include "core/fpdfapi/parser/cpdf_document.h"
 #include "fpdfsdk/cpdfsdk_document.h"
 #include "fpdfsdk/cpdfsdk_environment.h"
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "fpdfsdk/javascript/ijs_runtime.h"
 #include "public/fpdf_formfill.h"
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/cpdfxfa_document.h
index e3bafd7203..f67a880a36 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_document.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_
-#define FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_
+#ifndef FPDFSDK_FPDFXFA_CPDFXFA_DOCUMENT_H_
+#define FPDFSDK_FPDFXFA_CPDFXFA_DOCUMENT_H_
 
 #include <memory>
 
@@ -92,4 +92,4 @@ class CPDFXFA_Document {
   CPDFXFA_DocEnvironment m_DocEnv;
 };
 
-#endif  // FPDFSDK_FPDFXFA_FPDFXFA_DOC_H_
+#endif  // FPDFSDK_FPDFXFA_CPDFXFA_DOCUMENT_H_
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index c8a2a6c206..00cff3e28a 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 
 #include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
index cc622b7a40..80a183f807 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_
-#define FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_
+#ifndef FPDFSDK_FPDFXFA_CPDFXFA_PAGE_H_
+#define FPDFSDK_FPDFXFA_CPDFXFA_PAGE_H_
 
 #include <memory>
 
@@ -82,4 +82,4 @@ class CPDFXFA_Page {
   int m_iRef;
 };
 
-#endif  // FPDFSDK_FPDFXFA_FPDFXFA_PAGE_H_
+#endif  // FPDFSDK_FPDFXFA_CPDFXFA_PAGE_H_
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp
index b4e44c834e..b835fd4467 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
 
 #include <vector>
 
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index a6b08a0d33..958171d4ca 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_
-#define FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_
+#ifndef FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
+#define FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
 
 #include <vector>
 
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 
 #define JS_STR_VIEWERTYPE_STANDARD L"Exchange"
@@ -45,4 +45,4 @@ struct CFWL_TimerInfo : public IFWL_TimerInfo {
   IFWL_Timer* pTimer;
 };
 
-#endif  // FPDFSDK_FPDFXFA_FPDFXFA_UTIL_H_
+#endif  // FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
diff --git a/fpdfsdk/fsdk_define.h b/fpdfsdk/fsdk_define.h
index 94b18128a0..372ceb31e9 100644
--- a/fpdfsdk/fsdk_define.h
+++ b/fpdfsdk/fsdk_define.h
@@ -12,7 +12,7 @@
 #include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_document.h"
 #endif  // PDF_ENABLE_XFA
 
 #ifdef _WIN32
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index bae7ca0136..b10e5a6ed9 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -32,7 +32,7 @@
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fpdfsdk/fpdfxfa/fpdfxfa_app.h"
+#include "fpdfsdk/fpdfxfa/cpdfxfa_app.h"
 #include "fxjs/cfxjse_value.h"
 #endif  // PDF_ENABLE_XFA
author	dsinclair <dsinclair@chromium.org>	2016-10-04 14:02:47 -0700
committer	Commit bot <commit-bot@chromium.org>	2016-10-04 14:02:47 -0700
commit	4d29e78fc80285d222f2bad916354e3db970d0cc (patch)
tree	09b66b68a4a29f50a9c20ef079148b920ef29ff5
parent	98151cab3d24c021597d1fb075437675a3db7e12 (diff)
download	pdfium-chromium/2881.tar.xz