diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-03-28 18:39:04 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-28 18:39:04 +0000 |
| commit | 00d47a60e4cd0974771692a9d3fdd3ca28bf6eb2 (patch) | |
| tree | 66f8d0acac138c4c9176b675580c38a6c4f6bb9e | |
| parent | e3c204392a01870ecc9e8f3b2aa06b2b45306b5a (diff) | |
| download | pdfium-00d47a60e4cd0974771692a9d3fdd3ca28bf6eb2.tar.xz | |
Rename some fsdk files to cpdfsdk
This CL renames fsdk_common and fsdk_define to cpdfsdk_common and
cpdfsdk_helpers respectively.
Change-Id: I8ee7a308561f1ff2f510954444f953b0c8fed788
Reviewed-on: https://pdfium-review.googlesource.com/29371
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
42 files changed, 49 insertions, 49 deletions
@@ -117,12 +117,15 @@ jumbo_static_library("pdfium") { "fpdfsdk/cpdfsdk_baannot.h", "fpdfsdk/cpdfsdk_baannothandler.cpp", "fpdfsdk/cpdfsdk_baannothandler.h", + "fpdfsdk/cpdfsdk_common.h", "fpdfsdk/cpdfsdk_customaccess.cpp", "fpdfsdk/cpdfsdk_customaccess.h", "fpdfsdk/cpdfsdk_datetime.cpp", "fpdfsdk/cpdfsdk_datetime.h", "fpdfsdk/cpdfsdk_formfillenvironment.cpp", "fpdfsdk/cpdfsdk_formfillenvironment.h", + "fpdfsdk/cpdfsdk_helpers.cpp", + "fpdfsdk/cpdfsdk_helpers.h", "fpdfsdk/cpdfsdk_interform.cpp", "fpdfsdk/cpdfsdk_interform.h", "fpdfsdk/cpdfsdk_memoryaccess.cpp", @@ -156,9 +159,6 @@ jumbo_static_library("pdfium") { "fpdfsdk/fpdfview.cpp", "fpdfsdk/fsdk_actionhandler.cpp", "fpdfsdk/fsdk_actionhandler.h", - "fpdfsdk/fsdk_common.h", - "fpdfsdk/fsdk_define.cpp", - "fpdfsdk/fsdk_define.h", "fpdfsdk/fsdk_filewriteadapter.cpp", "fpdfsdk/fsdk_filewriteadapter.h", "fpdfsdk/fsdk_pauseadapter.cpp", diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp index 66db939539..fe90fb708e 100644 --- a/core/fxge/skia/fx_skia_device_unittest.cpp +++ b/core/fxge/skia/fx_skia_device_unittest.cpp @@ -8,7 +8,7 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkPictureRecorder.h" diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h index a6c4066ea5..f3311bc560 100644 --- a/fpdfsdk/cpdfsdk_annot.h +++ b/fpdfsdk/cpdfsdk_annot.h @@ -13,8 +13,8 @@ #include "core/fxcrt/observable.h" #include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cfx_systemhandler.h" -#include "fpdfsdk/fsdk_common.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_common.h" +#include "fpdfsdk/cpdfsdk_helpers.h" class CFX_Matrix; class CFX_RenderDevice; diff --git a/fpdfsdk/fsdk_common.h b/fpdfsdk/cpdfsdk_common.h index 78ecd98b4a..a5fb58f72d 100644 --- a/fpdfsdk/fsdk_common.h +++ b/fpdfsdk/cpdfsdk_common.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FSDK_COMMON_H_ -#define FPDFSDK_FSDK_COMMON_H_ +#ifndef FPDFSDK_CPDFSDK_COMMON_H_ +#define FPDFSDK_CPDFSDK_COMMON_H_ // for all fields #define FIELDFLAG_READONLY 1 @@ -25,4 +25,4 @@ #define FIELDFLAG_MULTISELECT (1 << 21) #define FIELDFLAG_COMMITONSELCHANGE (1 << 26) -#endif // FPDFSDK_FSDK_COMMON_H_ +#endif // FPDFSDK_CPDFSDK_COMMON_H_ diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index f00630c18b..3c14ac06ac 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -17,7 +17,7 @@ #include "core/fxcrt/observable.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/cpdfsdk_annot.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_formfill.h" #include "public/fpdf_fwlevent.h" diff --git a/fpdfsdk/fsdk_define.cpp b/fpdfsdk/cpdfsdk_helpers.cpp index 917d36d88e..45c2674a4d 100644 --- a/fpdfsdk/fsdk_define.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/parser/cpdf_array.h" diff --git a/fpdfsdk/fsdk_define.h b/fpdfsdk/cpdfsdk_helpers.h index c864f05046..c2f6515cf9 100644 --- a/fpdfsdk/fsdk_define.h +++ b/fpdfsdk/cpdfsdk_helpers.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_FSDK_DEFINE_H_ -#define FPDFSDK_FSDK_DEFINE_H_ +#ifndef FPDFSDK_CPDFSDK_HELPERS_H_ +#define FPDFSDK_CPDFSDK_HELPERS_H_ #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fxge/dib/cfx_dibitmap.h" @@ -110,4 +110,4 @@ FPDF_BOOL FPDFPageObj_SetFillColor(FPDF_PAGEOBJECT page_object, unsigned int B, unsigned int A); -#endif // FPDFSDK_FSDK_DEFINE_H_ +#endif // FPDFSDK_CPDFSDK_HELPERS_H_ diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 9231951d33..9b1dbb75ef 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -24,11 +24,11 @@ #include "fpdfsdk/cba_annotiterator.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/fsdk_actionhandler.h" -#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/ipdfsdk_annothandler.h" #include "fxjs/ijs_event_context.h" #include "fxjs/ijs_runtime.h" diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 055ad63aa5..23241953e4 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -24,11 +24,11 @@ #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/fsdk_actionhandler.h" -#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/pwl/cpwl_appstream.h" #include "fpdfsdk/pwl/cpwl_edit.h" diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index d9b12f5d3c..92dc8d621a 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -6,11 +6,11 @@ #include "fpdfsdk/formfiller/cffl_combobox.h" +#include "fpdfsdk/cpdfsdk_common.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pwl/cpwl_combo_box.h" #include "third_party/base/ptr_util.h" diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 2e2aab9c8f..6ec7e266e3 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -10,11 +10,11 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fxge/cfx_renderdevice.h" +#include "fpdfsdk/cpdfsdk_common.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/fsdk_common.h" namespace { diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h index 01927529f7..94ca59d284 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h @@ -13,7 +13,7 @@ #include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cpdfsdk_annot.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/pwl/cpwl_edit.h" class CFFL_FormFiller; diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index e628e59cb8..41e4774218 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -6,11 +6,11 @@ #include "fpdfsdk/formfiller/cffl_listbox.h" +#include "fpdfsdk/cpdfsdk_common.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pwl/cpwl_list_box.h" #include "third_party/base/ptr_util.h" diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index ad8d27c916..6d7277c8fa 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -6,10 +6,10 @@ #include "fpdfsdk/formfiller/cffl_textfield.h" +#include "fpdfsdk/cpdfsdk_common.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/fsdk_common.h" #include "third_party/base/ptr_util.h" CFFL_TextField::CFFL_TextField(CPDFSDK_FormFillEnvironment* pApp, diff --git a/fpdfsdk/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp index b1a134d914..55d39a0d46 100644 --- a/fpdfsdk/fpdf_dataavail.cpp +++ b/fpdfsdk/fpdf_dataavail.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/retain_ptr.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_formfill.h" #include "third_party/base/ptr_util.h" diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index b972141e11..2f05fc5cdc 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index 299318bd08..f1d95c7d7e 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -21,7 +21,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfdoc/cpdf_annot.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "third_party/base/stl_util.h" enum FPDF_TYPE { MAX, MIN }; diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp index ceceacf01d..6daaf13704 100644 --- a/fpdfsdk/fpdf_ppo.cpp +++ b/fpdfsdk/fpdf_ppo.cpp @@ -25,7 +25,7 @@ #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/cpp/fpdf_deleters.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 730ba48162..d53ab15d0e 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -14,7 +14,7 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_renderdevice.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/fsdk_pauseadapter.h" #include "public/fpdfview.h" #include "third_party/base/ptr_util.h" diff --git a/fpdfsdk/fpdf_structtree.cpp b/fpdfsdk/fpdf_structtree.cpp index 676824ef99..98123d94d1 100644 --- a/fpdfsdk/fpdf_structtree.cpp +++ b/fpdfsdk/fpdf_structtree.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfdoc/cpdf_structelement.h" #include "core/fpdfdoc/cpdf_structtree.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" namespace { diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 81a749aefb..e310e4d6f7 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -14,7 +14,7 @@ #include "core/fxge/cfx_gemodule.h" #include "core/fxge/fx_font.h" #include "core/fxge/systemfontinfo_iface.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/pwl/cpwl_font_map.h" #include "third_party/base/ptr_util.h" diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index 5a7e094b07..860ba42c96 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -20,7 +20,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fxge/cfx_pathdata.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" namespace { diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index c52807148e..2ab0bca454 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -22,7 +22,7 @@ #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpvt_generateap.h" #include "core/fxge/cfx_color.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" namespace { diff --git a/fpdfsdk/fpdfattachment.cpp b/fpdfsdk/fpdfattachment.cpp index 0de01b2e8a..0bb9364834 100644 --- a/fpdfsdk/fpdfattachment.cpp +++ b/fpdfsdk/fpdfattachment.cpp @@ -19,7 +19,7 @@ #include "core/fpdfdoc/cpdf_nametree.h" #include "core/fxcrt/cfx_datetime.h" #include "core/fxcrt/fx_extension.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" namespace { diff --git a/fpdfsdk/fpdfcatalog.cpp b/fpdfsdk/fpdfcatalog.cpp index 493e5aea43..af6e40a0ad 100644 --- a/fpdfsdk/fpdfcatalog.cpp +++ b/fpdfsdk/fpdfcatalog.cpp @@ -5,7 +5,7 @@ #include "public/fpdf_catalog.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFCatalog_IsTagged(FPDF_DOCUMENT document) { diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index 2ba0053d8e..d8be12066a 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -16,7 +16,7 @@ #include "core/fpdfdoc/cpdf_bookmarktree.h" #include "core/fpdfdoc/cpdf_dest.h" #include "core/fpdfdoc/cpdf_pagelabel.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp index 65e790cc32..7ea22d0aa4 100644 --- a/fpdfsdk/fpdfedit_embeddertest.cpp +++ b/fpdfsdk/fpdfedit_embeddertest.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fxcrt/fx_system.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/cpp/fpdf_deleters.h" #include "public/fpdf_annot.h" #include "public/fpdf_edit.h" diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp index a98a61f147..f1d90ece2d 100644 --- a/fpdfsdk/fpdfeditimg.cpp +++ b/fpdfsdk/fpdfeditimg.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/render/cpdf_dibsource.h" #include "fpdfsdk/cpdfsdk_customaccess.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "third_party/base/ptr_util.h" namespace { diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index 92e4357b68..29cad9a752 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -24,7 +24,7 @@ #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_annotlist.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_formfill.h" #include "third_party/base/logging.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfeditpath.cpp b/fpdfsdk/fpdfeditpath.cpp index 0b9ac4737c..745c3b763b 100644 --- a/fpdfsdk/fpdfeditpath.cpp +++ b/fpdfsdk/fpdfeditpath.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/page/cpdf_path.h" #include "core/fpdfapi/page/cpdf_pathobject.h" #include "core/fxcrt/fx_system.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "third_party/base/ptr_util.h" // These checks are here because core/ and public/ cannot depend on each other. diff --git a/fpdfsdk/fpdfedittext.cpp b/fpdfsdk/fpdfedittext.cpp index 460e852eaa..8155003a1f 100644 --- a/fpdfsdk/fpdfedittext.cpp +++ b/fpdfsdk/fpdfedittext.cpp @@ -24,7 +24,7 @@ #include "core/fxcrt/fx_extension.h" #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/fx_font.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_edit.h" namespace { diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 2f219f2f9d..6cf587c7ac 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -18,10 +18,10 @@ #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/fsdk_actionhandler.h" -#include "fpdfsdk/fsdk_define.h" #include "public/fpdfview.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index d12a66ad7d..2c615f434c 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -18,7 +18,7 @@ #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_extension.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/fsdk_filewriteadapter.h" #include "public/fpdf_edit.h" diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 68bf4f83d7..7778696931 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -14,7 +14,7 @@ #include "core/fpdftext/cpdf_linkextract.h" #include "core/fpdftext/cpdf_textpage.h" #include "core/fpdftext/cpdf_textpagefind.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 9a334d5fe6..ff2a4633f1 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -32,9 +32,9 @@ #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cpdfsdk_customaccess.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_memoryaccess.h" #include "fpdfsdk/cpdfsdk_pageview.h" -#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/fsdk_pauseadapter.h" #include "fxjs/ijs_runtime.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 18f5f99b0e..5553025371 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -12,11 +12,11 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fxcrt/fx_fallthrough.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h" #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h" -#include "fpdfsdk/fsdk_define.h" #include "fxjs/cjs_runtime.h" #include "fxjs/ijs_runtime.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp index 87cb4ba62a..f4f6efdd0e 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp @@ -9,9 +9,9 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fxcrt/fx_fallthrough.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h" -#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffdocview.h" diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp index c7201c3fbd..adba260041 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.cpp @@ -10,7 +10,7 @@ #include <vector> #include "fpdfsdk/cpdfsdk_formfillenvironment.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" namespace { diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp index 305d905c85..73c7d84f69 100644 --- a/fpdfsdk/fsdk_actionhandler.cpp +++ b/fpdfsdk/fsdk_actionhandler.cpp @@ -13,8 +13,8 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_interform.h" -#include "fpdfsdk/fsdk_define.h" #include "fxjs/ijs_event_context.h" #include "fxjs/ijs_runtime.h" #include "third_party/base/logging.h" diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp index 13efe86789..9f2c606309 100644 --- a/fpdfsdk/fsdk_baseform_embeddertest.cpp +++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp @@ -5,7 +5,7 @@ #include "fpdfsdk/cba_annotiterator.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "testing/embedder_test.h" #include "testing/embedder_test_mock_delegate.h" #include "testing/embedder_test_timer_handling_delegate.h" diff --git a/fxjs/cjs_object.h b/fxjs/cjs_object.h index 7b26fba527..8254af98de 100644 --- a/fxjs/cjs_object.h +++ b/fxjs/cjs_object.h @@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fxjs/cfxjs_engine.h" #include "fxjs/cjs_runtime.h" diff --git a/testing/xfa_js_embedder_test.cpp b/testing/xfa_js_embedder_test.cpp index 133a938643..0fe4b7a624 100644 --- a/testing/xfa_js_embedder_test.cpp +++ b/testing/xfa_js_embedder_test.cpp @@ -6,8 +6,8 @@ #include <string> +#include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" -#include "fpdfsdk/fsdk_define.h" #include "fxjs/cfxjse_engine.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/base/ptr_util.h" |