From 61046b948a7a15a605147635d317ff3bb27fb452 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 18 Feb 2016 14:48:48 -0500 Subject: Sort headers in non-xfa directories. This CL runs the chromium sort-headers.py script over the non-xfa code. XFA will be done after the includes have been updated to full paths. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1711793002 . --- core/include/fxcrt/fx_stream.h | 2 +- core/include/fxcrt/fx_system.h | 4 ++-- core/src/fpdfapi/fpdf_basic_module.cpp | 2 +- core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 4 ++-- core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 2 +- core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 2 +- core/src/fxcodec/codec/fx_codec_progress.cpp | 2 +- core/src/fxcrt/fx_basic_gcc.cpp | 2 +- core/src/fxcrt/fx_basic_util.cpp | 2 +- core/src/fxge/android/fpf_skiafontmgr.cpp | 2 +- core/src/fxge/android/fpf_skiamodule.cpp | 2 +- core/src/fxge/apple/fx_apple_platform.cpp | 2 +- core/src/fxge/apple/fx_quartz_device.cpp | 2 +- core/src/fxge/dib/fx_dib_composite.cpp | 2 +- core/src/fxge/dib/fx_dib_main.cpp | 2 +- core/src/fxge/ge/fx_ge_text.cpp | 4 ++-- core/src/fxge/skia/fx_skia_device.cpp | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) (limited to 'core') diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index 263a355fff..b35b63544f 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -23,8 +23,8 @@ FX_WCHAR FX_GetFolderSeparator(); #define FX_FILESIZE int32_t #else #include -#include #include +#include #ifndef O_BINARY #define O_BINARY 0 #endif diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 5ab7f723ad..d52377060a 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -55,13 +55,13 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #define _CRT_SECURE_NO_WARNINGS -#include #include +#include #endif #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include #include +#include #endif #ifdef __cplusplus diff --git a/core/src/fpdfapi/fpdf_basic_module.cpp b/core/src/fpdfapi/fpdf_basic_module.cpp index a2a7e09a57..cf843cc4d9 100644 --- a/core/src/fpdfapi/fpdf_basic_module.cpp +++ b/core/src/fpdfapi/fpdf_basic_module.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcodec/fx_codec.h" #include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fxcodec/fx_codec.h" namespace { diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index e8bd55ed8b..7d294c4c52 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -8,9 +8,9 @@ #include -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fpdfapi/fpdf_serial.h" #include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_serial.h" +#include "core/include/fxcrt/fx_ext.h" #include "third_party/base/stl_util.h" #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024) diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 540f9a0731..8d5a61ad13 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -6,13 +6,13 @@ #include "core/src/fpdfapi/fpdf_font/font_int.h" -#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_resource.h" #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_freetype.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "third_party/base/stl_util.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index db2eec69cc..ba75753c9a 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -10,8 +10,8 @@ #include -#include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fxcodec/fx_codec.h" namespace { diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/src/fxcodec/codec/fx_codec_progress.cpp index 1165f7f1d6..2edf750d7f 100644 --- a/core/src/fxcodec/codec/fx_codec_progress.cpp +++ b/core/src/fxcodec/codec/fx_codec_progress.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_dib.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" #include "core/src/fxcodec/codec/fx_codec_progress.h" void CFXCODEC_WeightTable::Calc(int dest_len, int dest_min, diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp index 50499a8dc4..d905d6b498 100644 --- a/core/src/fxcrt/fx_basic_gcc.cpp +++ b/core/src/fxcrt/fx_basic_gcc.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include #include #include +#include #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxcrt/fx_string.h" diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp index 9f32ebe752..fdf7284883 100644 --- a/core/src/fxcrt/fx_basic_util.cpp +++ b/core/src/fxcrt/fx_basic_util.cpp @@ -10,8 +10,8 @@ #include #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ -#include #include +#include #else #include #endif diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 2c13a594e0..ce3b80506d 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -12,8 +12,8 @@ #define FPF_SKIAMATCHWEIGHT_NAME2 60 #define FPF_SKIAMATCHWEIGHT_1 16 #define FPF_SKIAMATCHWEIGHT_2 8 -#include "core/src/fxge/android/fpf_skiafontmgr.h" #include "core/src/fxge/android/fpf_skiafont.h" +#include "core/src/fxge/android/fpf_skiafontmgr.h" #ifdef __cplusplus extern "C" { #endif diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index 2cae2c89d1..116b65f7f0 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -6,8 +6,8 @@ #include "core/src/fxge/android/fx_fpf.h" #if _FX_OS_ == _FX_ANDROID_ -#include "core/src/fxge/android/fpf_skiamodule.h" #include "core/src/fxge/android/fpf_skiafontmgr.h" +#include "core/src/fxge/android/fpf_skiamodule.h" static IFPF_DeviceModule* gs_pPFModule = NULL; IFPF_DeviceModule* FPF_GetDeviceModule() { if (!gs_pPFModule) { diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index 470b19c084..5108f7ecc2 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -9,10 +9,10 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "core/src/fxge/apple/apple_int.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_apple.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" +#include "core/src/fxge/apple/apple_int.h" #include "core/src/fxge/dib/dib_int.h" #include "core/src/fxge/ge/fx_text_int.h" diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index c6c382ca28..e77daff9fb 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -12,8 +12,8 @@ #include "core/src/fxge/ge/fx_text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "core/src/fxge/apple/apple_int.h" #include "core/include/fxge/fx_ge_apple.h" +#include "core/src/fxge/apple/apple_int.h" #ifndef CGFLOAT_IS_DOUBLE #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers #endif diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index 56bde94223..6068dffe75 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" #include "core/src/fxge/dib/dib_int.h" const uint8_t _color_sqrt[256] = { diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 484797d3cf..7c27d5451b 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -8,8 +8,8 @@ #include -#include "core/include/fxge/fx_ge.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" #include "core/src/fxge/dib/dib_int.h" FX_BOOL ConvertBuffer(FXDIB_Format dest_format, diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 7dbeac3316..ae426b093c 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" -#include "core/include/fxge/fx_freetype.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" #include "core/src/fxge/ge/fx_text_int.h" #undef FX_GAMMA diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index 1bcbc53e9f..dede637575 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -8,10 +8,10 @@ #include "core/include/fxcodec/fx_codec.h" #include "SkDashPathEffect.h" -#include "SkTLazy.h" -#include "SkScan.h" #include "SkRasterClip.h" +#include "SkScan.h" #include "SkStroke.h" +#include "SkTLazy.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" #include "core/src/fxge/skia/fx_skia_blitter_new.h" -- cgit v1.2.3