From 6675a80c6afe3652b7bd918b80a16a8effb51b8f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 4 Jun 2015 19:05:21 -0700 Subject: Merge to XFA: Move fx_safe_types.h to include/ directory. Original Review URL: https://codereview.chromium.org/1147353006 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1152693005 --- fpdfsdk/src/fpdfview.cpp | 3 ++- fpdfsdk/src/pdfwindow/PWL_Edit.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 52e0ccd317..2cc9dded46 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + #include "../../public/fpdf_ext.h" #include "../../public/fpdf_formfill.h" #include "../../public/fpdf_progressive.h" @@ -11,7 +12,7 @@ #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" #include "../include/fsdk_rendercontext.h" -#include "../../../core/src/fxcrt/fx_safe_types.h" +#include "../../../core/include/fxcrt/fx_safe_types.h" #include "../../third_party/base/nonstd_unique_ptr.h" #include "../../third_party/base/numerics/safe_conversions_impl.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp index 678da68b49..83f7340fad 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../core/include/fxcrt/fx_safe_types.h" #include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" +#include "../../include/pdfwindow/PWL_Caret.h" #include "../../include/pdfwindow/PWL_Edit.h" +#include "../../include/pdfwindow/PWL_EditCtrl.h" +#include "../../include/pdfwindow/PWL_FontMap.h" #include "../../include/pdfwindow/PWL_ScrollBar.h" #include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_Caret.h" -#include "../../include/pdfwindow/PWL_FontMap.h" -#include "../../../core/src/fxcrt/fx_safe_types.h" +#include "../../include/pdfwindow/PWL_Wnd.h" /* ---------------------------- CPWL_Edit ------------------------------ */ -- cgit v1.2.3