From 6b776fed401f97ce2589a847465280de704b9d7f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 28 May 2015 13:09:35 -0700 Subject: Fix ALL the include guards. Get rid of leading _CAPITAL identifiers. A large number of these didn't actually match the filename. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1160443004 --- core/src/fxge/agg/include/fx_agg_driver.h | 9 ++++++--- core/src/fxge/agg/include/fxfx_agg_basics.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_conv_dash.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_conv_stroke.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_curves.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_path_storage.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h | 8 +++++--- core/src/fxge/agg/include/fxfx_agg_scanline_u.h | 8 +++++--- core/src/fxge/android/fpf_skiafont.h | 8 +++++--- core/src/fxge/android/fpf_skiafontmgr.h | 8 +++++--- core/src/fxge/android/fpf_skiamodule.h | 8 +++++--- core/src/fxge/android/fx_android_font.h | 8 +++++--- core/src/fxge/android/fx_fpf.h | 12 +++++++----- core/src/fxge/apple/apple_int.h | 8 +++++--- core/src/fxge/dib/dib_int.h | 6 +++--- core/src/fxge/ge/text_int.h | 6 +++--- core/src/fxge/skia/fx_skia_blitter_new.h | 9 +++++---- core/src/fxge/skia/fx_skia_device.h | 11 ++++++----- core/src/fxge/win32/dwrite_int.h | 8 +++++--- core/src/fxge/win32/win32_int.h | 4 ++++ 23 files changed, 114 insertions(+), 71 deletions(-) (limited to 'core/src/fxge') diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c87fc246be..f4b9368eff 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_AGG_DEVICE_DRIVER_ -#define _FX_AGG_DEVICE_DRIVER_ +#ifndef FX_AGG_DRIVER_H_ +#define FX_AGG_DRIVER_H_ + #include "fxfx_agg_path_storage.h" #include "fxfx_agg_rasterizer_scanline_aa.h" + class CAgg_PathData { public: @@ -118,4 +120,5 @@ public: CFX_DIBitmap* m_pOriDevice; FX_BOOL m_bGroupKnockout; }; -#endif + +#endif // FX_AGG_DRIVER_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_basics.h b/core/src/fxge/agg/include/fxfx_agg_basics.h index 57fbd2ebb9..e27a843bba 100644 --- a/core/src/fxge/agg/include/fxfx_agg_basics.h +++ b/core/src/fxge/agg/include/fxfx_agg_basics.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_BASICS_H_ -#define _FXFX_AGG_BASICS_H_ +#ifndef FXFX_AGG_BASICS_H_ +#define FXFX_AGG_BASICS_H_ + #include "../agg23/agg_basics.h" -#endif + +#endif // FXFX_AGG_BASICS_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h index 948b619355..2b64bf900a 100644 --- a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h +++ b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CLIP_LIANG_BARSKY_H_ -#define _FXFX_AGG_CLIP_LIANG_BARSKY_H_ +#ifndef FXFX_AGG_CLIP_LIANG_BARSKY_H_ +#define FXFX_AGG_CLIP_LIANG_BARSKY_H_ + #include "../agg23/agg_clip_liang_barsky.h" -#endif + +#endif // FXFX_AGG_CLIP_LIANG_BARSKY_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h index 5f80a06e19..fb1e42dae9 100644 --- a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h +++ b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CONV_DASH_H_ -#define _FXFX_AGG_CONV_DASH_H_ +#ifndef FXFX_AGG_CONV_DASH_H_ +#define FXFX_AGG_CONV_DASH_H_ + #include "../agg23/agg_conv_dash.h" -#endif + +#endif // FXFX_AGG_CONV_DASH_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h index de38386ea2..531df5012e 100644 --- a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h +++ b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CONV_STROKE_H_ -#define _FXFX_AGG_CONV_STROKE_H_ +#ifndef FXFX_AGG_CONV_STROKE_H_ +#define FXFX_AGG_CONV_STROKE_H_ + #include "../agg23/agg_conv_stroke.h" -#endif + +#endif // FXFX_AGG_CONV_STROKE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_curves.h b/core/src/fxge/agg/include/fxfx_agg_curves.h index 54efaa2b26..1879958eca 100644 --- a/core/src/fxge/agg/include/fxfx_agg_curves.h +++ b/core/src/fxge/agg/include/fxfx_agg_curves.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CURVERS_H_ -#define _FXFX_AGG_CURVERS_H_ +#ifndef FXFX_AGG_CURVES_H_ +#define FXFX_AGG_CURVES_H_ + #include "../agg23/agg_curves.h" -#endif + +#endif // FXFX_AGG_CURVES_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_path_storage.h b/core/src/fxge/agg/include/fxfx_agg_path_storage.h index 9168eb26a8..ab7a85bca5 100644 --- a/core/src/fxge/agg/include/fxfx_agg_path_storage.h +++ b/core/src/fxge/agg/include/fxfx_agg_path_storage.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_PATH_STORAGE_H_ -#define _FXFX_AGG_PATH_STORAGE_H_ +#ifndef FXFX_AGG_PATH_STORAGE_H_ +#define FXFX_AGG_PATH_STORAGE_H_ + #include "../agg23/agg_path_storage.h" -#endif + +#endif // FXFX_AGG_PATH_STORAGE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h index 3f61cec51a..a445298f81 100644 --- a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h +++ b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ -#define _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ +#ifndef FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ +#define FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ + #include "../agg23/agg_rasterizer_scanline_aa.h" -#endif + +#endif // FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h index 11d8cbb0a8..1775dabe3e 100644 --- a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h +++ b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RENDER_SCANLINE_H_ -#define _FXFX_AGG_RENDER_SCANLINE_H_ +#ifndef FXFX_AGG_RENDER_SCANLINE_H_ +#define FXFX_AGG_RENDER_SCANLINE_H_ + #include "../agg23/agg_renderer_scanline.h" -#endif + +#endif // FXFX_AGG_RENDER_SCANLINE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h index eb6886e8de..0eb48b84c0 100644 --- a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h +++ b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RENDERING_BUFFER_H_ -#define _FXFX_AGG_RENDERING_BUFFER_H_ +#ifndef FXFX_AGG_RENDERING_BUFFER_H_ +#define FXFX_AGG_RENDERING_BUFFER_H_ + #include "../agg23/agg_rendering_buffer.h" -#endif + +#endif // FXFX_AGG_RENDERING_BUFFER_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h index cc7d2e7f75..c850f621a3 100644 --- a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h +++ b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_SCANLINE_U_H_ -#define _FXFX_AGG_SCANLINE_U_H_ +#ifndef FXFX_AGG_SCANLINE_U_H_ +#define FXFX_AGG_SCANLINE_U_H_ + #include "../agg23/agg_scanline_u.h" -#endif + +#endif // FXFX_AGG_SCANLINE_U_H_ diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 4285e13554..135c830c95 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_SKIA_FONT_H_ -#define _FPF_SKIA_FONT_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ + #if _FX_OS_ == _FX_ANDROID_ class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; @@ -54,4 +55,5 @@ protected: FX_DWORD m_dwRefCount; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 1ec4a1d678..3c072fa186 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_SKIA_FONTMGR_H_ -#define _FPF_SKIA_FONTMGR_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ + #if _FX_OS_ == _FX_ANDROID_ #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 @@ -114,4 +115,5 @@ protected: CFX_MapPtrToPtr m_FamilyFonts; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h index 7f5375172a..f97aa95d23 100644 --- a/core/src/fxge/android/fpf_skiamodule.h +++ b/core/src/fxge/android/fpf_skiamodule.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_MODULE_H_ -#define _FPF_MODULE_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ + #if _FX_OS_ == _FX_ANDROID_ class CFPF_SkiaFontMgr; class CFPF_SkiaDeviceModule : public IFPF_DeviceModule @@ -19,4 +20,5 @@ protected: CFPF_SkiaFontMgr *m_pFontMgr; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h index b6bfdf9396..fb7ff7cd92 100644 --- a/core/src/fxge/android/fx_android_font.h +++ b/core/src/fxge/android/fx_android_font.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_ANDROID_FONT_H_ -#define _FX_ANDROID_FONT_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ +#define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ + #if _FX_OS_ == _FX_ANDROID_ class IFPF_FontMgr; class CFX_AndroidFontInfo : public IFX_SystemFontInfo @@ -33,4 +34,5 @@ protected: IFPF_FontMgr *m_pFontMgr; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h index 1108fffed4..beef3c7233 100644 --- a/core/src/fxge/android/fx_fpf.h +++ b/core/src/fxge/android/fx_fpf.h @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_FPF_H_ -#define _FX_FPF_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_ +#define CORE_SRC_FXGE_ANDROID_FX_FPF_H_ + #include "../../../include/fxcrt/fx_ext.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxge/fpf.h" +#include "../../../include/fxge/fx_freetype.h" +#include "../../../include/fxge/fx_ge.h" #include "fx_android_font.h" -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FX_FPF_H_ diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 6d8260c60f..5b083d83eb 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _APPLE_INT_H_ -#define _APPLE_INT_H_ +#ifndef CORE_SRC_FXGE_APPLE_APPLE_INT_H_ +#define CORE_SRC_FXGE_APPLE_APPLE_INT_H_ + #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #if _FX_OS_ == _FX_MACOSX_ #include @@ -243,4 +244,5 @@ FX_DWORD FX_IOSGetMatchFamilyNameHashcode(FX_LPCSTR pFontName); FX_UINT32 FX_IOSGetFamilyNamesCount(); FX_LPCSTR FX_IOSGetFamilyName( FX_UINT32 uIndex); #endif -#endif + +#endif // CORE_SRC_FXGE_APPLE_APPLE_INT_H_ diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h index 844c3566ce..c82a0378b8 100644 --- a/core/src/fxge/dib/dib_int.h +++ b/core/src/fxge/dib/dib_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _DIB_INT_H_ -#define _DIB_INT_H_ +#ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_ +#define CORE_SRC_FXGE_DIB_DIB_INT_H_ class CPDF_FixedMatrix { @@ -90,4 +90,4 @@ public: int m_State; }; -#endif // _DIB_INT_H_ +#endif // CORE_SRC_FXGE_DIB_DIB_INT_H_ diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index d6b794a800..34496e8b13 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _TEXT_INT_H_ -#define _TEXT_INT_H_ +#ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_ +#define CORE_SRC_FXGE_GE_TEXT_INT_H_ struct _CFX_UniqueKeyGen { void Generate(int count, ...); @@ -102,4 +102,4 @@ public: CFX_ByteString m_FontTables; }; -#endif // _TEXT_INT_H_ +#endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h index 84fe89dce6..1193e64c1c 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.h +++ b/core/src/fxge/skia/fx_skia_blitter_new.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef _FX_SKIABLITTER_H_ -#define _FX_SKIABLITTER_H_ -//#define _SKIA_SUPPORT_ +#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ +#define CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ + #if defined(_SKIA_SUPPORT_) class CFX_SkiaRenderer : public SkBlitter { @@ -226,4 +226,5 @@ public: int m_dstHeight; }; #endif -#endif + +#endif // CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h index e92af2269e..7ae019c124 100644 --- a/core/src/fxge/skia/fx_skia_device.h +++ b/core/src/fxge/skia/fx_skia_device.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef _FX_SKIA_DEVICE_DRIVER_ -#define _FX_SKIA_DEVICE_DRIVER_ -//#define _SKIA_SUPPORT_ +#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ +#define CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ + #if defined(_SKIA_SUPPORT_) class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { @@ -86,5 +86,6 @@ public: CFX_AggDeviceDriver* m_pAggDriver; }; -#endif -#endif// _FX_SKIA_DEVICE_DRIVER_ \ No newline at end of file +#endif // defined(_SKIA_SUPPORT_) + +#endif // CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ diff --git a/core/src/fxge/win32/dwrite_int.h b/core/src/fxge/win32/dwrite_int.h index 2eecc7c76b..d95f115fbc 100644 --- a/core/src/fxge/win32/dwrite_int.h +++ b/core/src/fxge/win32/dwrite_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_DIRECT_WRITE_ -#define _FX_DIRECT_WRITE_ +#ifndef CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ +#define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ + #ifndef DECLSPEC_UUID #if (_MSC_VER >= 1100) && defined (__cplusplus) #define DECLSPEC_UUID(x) __declspec(uuid(x)) @@ -56,4 +57,5 @@ protected: void* m_pDwFontContext; void* m_pDwTextRenderer; }; -#endif + +#endif // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index bc3eb878d9..7c5c0720b1 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -3,6 +3,8 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXGE_WIN32_WIN32_INT_H_ +#define CORE_SRC_FXGE_WIN32_WIN32_INT_H_ struct WINDIB_Open_Args_; class CGdiplusExt @@ -236,3 +238,5 @@ protected: CFX_PSRenderer m_PSRenderer; }; void _Color2Argb(FX_ARGB& argb, FX_DWORD color, int alpha_flag, void* pIccTransform); + +#endif // CORE_SRC_FXGE_WIN32_WIN32_INT_H_ -- cgit v1.2.3