From 74a34fc71ab02400a4c958709138302a1ab4c0e7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 16:41:42 -0700 Subject: Move core/fxge/include to core/fxge BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2377393002 --- fpdfsdk/DEPS | 2 +- fpdfsdk/cfx_systemhandler.cpp | 6 +++--- fpdfsdk/cpdfsdk_interform.cpp | 6 +++--- fpdfsdk/cpdfsdk_widget.cpp | 6 +++--- fpdfsdk/formfiller/cba_fontmap.cpp | 2 +- fpdfsdk/formfiller/cffl_formfiller.cpp | 2 +- fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 6 +++--- fpdfsdk/fpdf_progressive.cpp | 4 ++-- fpdfsdk/fpdf_sysfontinfo.cpp | 8 ++++---- fpdfsdk/fpdf_transformpage.cpp | 2 +- fpdfsdk/fpdfformfill.cpp | 2 +- fpdfsdk/fpdfview.cpp | 6 +++--- fpdfsdk/fxedit/fxet_edit.cpp | 6 +++--- fpdfsdk/include/cpdfsdk_interform.h | 2 +- fpdfsdk/include/fsdk_define.h | 2 +- fpdfsdk/pdfwindow/PWL_Caret.cpp | 6 +++--- fpdfsdk/pdfwindow/PWL_ComboBox.cpp | 4 ++-- fpdfsdk/pdfwindow/PWL_Edit.cpp | 8 ++++---- fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 2 +- fpdfsdk/pdfwindow/PWL_FontMap.h | 2 +- fpdfsdk/pdfwindow/PWL_ScrollBar.cpp | 4 ++-- fpdfsdk/pdfwindow/PWL_Utils.cpp | 6 +++--- 22 files changed, 47 insertions(+), 47 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index d01574dd3f..0fed7f3228 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -8,7 +8,7 @@ include_rules = [ '+core/fpdfdoc', '+core/fxcodec', '+core/fxcrt', - '+core/fxge/include', + '+core/fxge', '+public', '+v8', '+xfa/fwl/core/include', diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index c7d81d5259..03a737459f 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -9,9 +9,9 @@ #include #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/cfx_fontmgr.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmgr.h" +#include "core/fxge/cfx_gemodule.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h" diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 9afd30b57b..eb257cc581 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -17,9 +17,9 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfdoc/cpdf_actionfields.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/include/cba_annotiterator.h" diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 284fe8a762..d41f8927d7 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -16,9 +16,9 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/include/cpdfsdk_document.h" diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 60e17a3ae8..43932a3afd 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_formfield.h" -#include "core/fxge/include/cfx_substfont.h" +#include "core/fxge/cfx_substfont.h" #include "fpdfsdk/include/cpdfsdk_annot.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 64a76366f9..ca3c8f0acd 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -7,7 +7,7 @@ #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 1289becd7f..dd30b8ecf2 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -8,9 +8,9 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cffl_checkbox.h" #include "fpdfsdk/formfiller/cffl_combobox.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 4722a9f0bc..70eff8b4e2 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -10,8 +10,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fxcrt/fx_memory.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_pauseadapter.h" #include "public/fpdfview.h" diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index c5eab95d56..a50a8ba312 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -6,10 +6,10 @@ #include "public/fpdf_sysfontinfo.h" -#include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/fx_font.h" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/fx_font.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h" diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index 4fb0a50e20..dfc0ea028f 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "fpdfsdk/include/fsdk_define.h" namespace { diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 11d4467854..dfa63da491 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -16,7 +16,7 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxge/include/cfx_fxgedevice.h" +#include "core/fxge/cfx_fxgedevice.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 5f115f2db5..50831d6d2e 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -24,8 +24,8 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "fpdfsdk/include/cpdfsdk_pageview.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_pauseadapter.h" @@ -43,7 +43,7 @@ #endif // PDF_ENABLE_XFA #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -#include "core/fxge/include/cfx_windowsdevice.h" +#include "core/fxge/cfx_windowsdevice.h" #endif UnderlyingDocumentType* UnderlyingFromFPDFDocument(FPDF_DOCUMENT doc) { diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index db299e5bf7..bed91dc98c 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -21,9 +21,9 @@ #include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h" diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h index 6bea3cfac0..133fe90341 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/include/cpdfsdk_interform.h @@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/fx_basic.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_Dictionary; class CPDF_FormControl; diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index d9c9b46901..ec99dbbf50 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -8,7 +8,7 @@ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp index 62f424b86e..0965ce10d0 100644 --- a/fpdfsdk/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp @@ -6,9 +6,9 @@ #include "fpdfsdk/pdfwindow/PWL_Caret.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp index c02b268d14..ad390766c5 100644 --- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp @@ -6,8 +6,8 @@ #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/fxedit/include/fxet_list.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index 8c02607719..c5e928771e 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -12,10 +12,10 @@ #include "core/fpdfdoc/cpvt_word.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/fx_xml.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index c99af4d155..8452febb97 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -8,7 +8,7 @@ #include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h" diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index 3dcd33919f..5acba9882a 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h @@ -10,7 +10,7 @@ #include #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "public/fpdf_sysfontinfo.h" diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp index 17f62f58d6..684f6c337c 100644 --- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp @@ -6,8 +6,8 @@ #include "fpdfsdk/pdfwindow/PWL_ScrollBar.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 4b19fd5927..6503fc60db 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp @@ -9,9 +9,9 @@ #include #include "core/fpdfdoc/cpvt_word.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Icon.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" -- cgit v1.2.3