From 04d02dbdd511aed4ddd61d8648edc633a0fb8c43 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Feb 2016 13:04:17 -0500 Subject: Expand XFA includes to be relative to pdfium/. This Cl updates the includes in the XFA directory to be relative to the pdfium/ directory instead of the current directory. This does not sort the includes as that is a larger IWYU task that will be handled separately. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1723533002 . --- xfa/src/fdp/include/fde.h | 22 +++++++++++----------- xfa/src/fdp/src/css/fde_csscache.cpp | 2 +- xfa/src/fdp/src/css/fde_cssdatatable.cpp | 2 +- xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 2 +- xfa/src/fdp/src/css/fde_cssdeclaration.h | 2 +- xfa/src/fdp/src/css/fde_cssstyleselector.cpp | 6 +++--- xfa/src/fdp/src/css/fde_cssstylesheet.cpp | 6 +++--- xfa/src/fdp/src/css/fde_cssstylesheet.h | 2 +- xfa/src/fdp/src/css/fde_csssyntax.cpp | 4 ++-- xfa/src/fdp/src/fde/fde_devbasic.cpp | 2 +- xfa/src/fdp/src/fde/fde_gdidevice.cpp | 4 ++-- xfa/src/fdp/src/fde/fde_gedevice.cpp | 6 +++--- xfa/src/fdp/src/fde/fde_geobject.cpp | 4 ++-- xfa/src/fdp/src/fde/fde_iterator.cpp | 2 +- xfa/src/fdp/src/fde/fde_object.cpp | 2 +- xfa/src/fdp/src/fde/fde_render.cpp | 2 +- xfa/src/fdp/src/tto/fde_textout.cpp | 2 +- xfa/src/fdp/src/xml/fde_xml_imp.cpp | 2 +- 18 files changed, 37 insertions(+), 37 deletions(-) (limited to 'xfa/src/fdp') diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 1d6f360391..2ec103fe25 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -9,16 +9,16 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_H_ #define XFA_SRC_FDP_INCLUDE_FDE_H_ -#include "fde_mem.h" -#include "fde_xml.h" -#include "fde_img.h" -#include "fde_brs.h" -#include "fde_pen.h" -#include "fde_pth.h" -#include "fde_tto.h" -#include "fde_psr.h" -#include "fde_css.h" -#include "fde_rdv.h" -#include "fde_rdr.h" +#include "xfa/src/fdp/include/fde_mem.h" +#include "xfa/src/fdp/include/fde_xml.h" +#include "xfa/src/fdp/include/fde_img.h" +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_pen.h" +#include "xfa/src/fdp/include/fde_pth.h" +#include "xfa/src/fdp/include/fde_tto.h" +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_rdr.h" #endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index a4f89c9867..5d98b98629 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/foxitlib.h" -#include "fde_csscache.h" +#include "xfa/src/fdp/src/css/fde_csscache.h" _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index 5d0fa9fe03..cda1fe4638 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 1d4f58b8d0..08ea0ee7da 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_cssdeclaration.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { for (FDE_LPCSSPROPERTYHOLDER pHolder = m_pFirstProperty; pHolder; diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h index 8670e5e169..3cb6418a32 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.h +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target { int16_t eProperty; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index d58407bee0..815aaf5604 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csscache.h" -#include "fde_cssdeclaration.h" -#include "fde_cssstyleselector.h" +#include "xfa/src/fdp/src/css/fde_csscache.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.h" +#include "xfa/src/fdp/src/css/fde_cssstyleselector.h" int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) { int32_t iCount = m_arrCounterData.GetSize(); for (int32_t i = 0; i < iCount; i++) { diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index b9da5b6b8b..4aa9bf77b2 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csssyntax.h" -#include "fde_cssdatatable.h" -#include "fde_cssstylesheet.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_cssstylesheet.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset," diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h index 596443bfcb..789e55f667 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ -#include "fde_cssdeclaration.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.h" class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { public: diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 2308281be5..b546d1046f 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csssyntax.h" -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" #ifdef _cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index c4cf5032b4..bcc441806c 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_devbasic.h" +#include "xfa/src/fdp/src/fde/fde_devbasic.h" static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, 16, diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.cpp b/xfa/src/fdp/src/fde/fde_gdidevice.cpp index 55b206e80c..e29b3b18da 100644 --- a/xfa/src/fdp/src/fde/fde_gdidevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gdidevice.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "stdafx.h" -#include "fde_gdidevice.h" -#include "fde_gdiobject.h" +#include "xfa/src/fdp/src/fde/fde_gdidevice.h" + #ifdef _FDEPLUS #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 65b76762d2..841882f419 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -7,9 +7,9 @@ #include #include "xfa/src/foxitlib.h" -#include "fde_gedevice.h" -#include "fde_geobject.h" -#include "fde_devbasic.h" +#include "xfa/src/fdp/src/fde/fde_gedevice.h" +#include "xfa/src/fdp/src/fde/fde_geobject.h" +#include "xfa/src/fdp/src/fde/fde_devbasic.h" #ifndef _FDEPLUS #ifdef _cplusplus exten "C" { diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index c005a74117..92ec6ea4da 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_object.h" -#include "fde_geobject.h" +#include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/fdp/src/fde/fde_geobject.h" #ifndef _FDEPLUS IFDE_Path* IFDE_Path::Create() { return new CFDE_Path; diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index d711c4b6fc..5d6c415a8e 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_iterator.h" +#include "xfa/src/fdp/src/fde/fde_iterator.h" IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; } diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index b033d0b4ee..47a1bb5efe 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_object.h" +#include "xfa/src/fdp/src/fde/fde_object.h" IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); } diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index 564c31d480..30e208c387 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_render.h" +#include "xfa/src/fdp/src/fde/fde_render.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index a5c398a1f3..7150173dbb 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/foxitlib.h" -#include "fde_textout.h" +#include "xfa/src/fdp/src/tto/fde_textout.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; } diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 1f90f0d70a..e5250fde28 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/foxitlib.h" -#include "fde_xml_imp.h" +#include "xfa/src/fdp/src/xml/fde_xml_imp.h" #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.3