diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-06 10:00:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 10:00:40 -0700 |
commit | 48baa5f230a886b0579a9626711e7d71376b085e (patch) | |
tree | 62212bf5d496228e50df09cf4e437a1308f821a7 /core/fxge/win32 | |
parent | 392f1022a3c525a053a7d143d2b23a76526a1aea (diff) | |
download | pdfium-48baa5f230a886b0579a9626711e7d71376b085e.tar.xz |
Move core/include/fxge to core/fxge/include.
This CL is a straight move of the fxge includes into core/fxge/include.
Review URL: https://codereview.chromium.org/1868533002
Diffstat (limited to 'core/fxge/win32')
-rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 6 | ||||
-rw-r--r-- | core/fxge/win32/fx_win32_dib.cpp | 4 | ||||
-rw-r--r-- | core/fxge/win32/fx_win32_dwrite.cpp | 4 | ||||
-rw-r--r-- | core/fxge/win32/fx_win32_gdipext.cpp | 4 | ||||
-rw-r--r-- | core/fxge/win32/fx_win32_print.cpp | 6 | ||||
-rw-r--r-- | core/fxge/win32/win32_int.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index ed57a02c23..bfcda1547c 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <crtdbg.h> @@ -12,11 +12,11 @@ #include "core/fxge/agg/fx_agg_driver.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/fx_ge_win32.h" #include "core/fxge/win32/dwrite_int.h" #include "core/fxge/win32/win32_int.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/include/fxge/fx_ge_win32.h" #include "third_party/base/stl_util.h" class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo { diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp index cc627dbab0..eefa991eeb 100644 --- a/core/fxge/win32/fx_win32_dib.cpp +++ b/core/fxge/win32/fx_win32_dib.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <windows.h> +#include "core/fxge/include/fx_ge_win32.h" #include "core/fxge/win32/win32_int.h" -#include "core/include/fxge/fx_ge_win32.h" CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) { CFX_ByteString result; diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp index f95b5eb4a3..aa6ba9c8b9 100644 --- a/core/fxge/win32/fx_win32_dwrite.cpp +++ b/core/fxge/win32/fx_win32_dwrite.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <dwrite.h> +#include "core/fxge/include/fx_ge_win32.h" #include "core/fxge/win32/dwrite_int.h" -#include "core/include/fxge/fx_ge_win32.h" typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)( __in DWRITE_FACTORY_TYPE, diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index b9c2190041..4e52a8941a 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <windows.h> @@ -17,8 +17,8 @@ using std::max; #include <gdiplus.h> +#include "core/fxge/include/fx_ge_win32.h" #include "core/fxge/win32/win32_int.h" -#include "core/include/fxge/fx_ge_win32.h" using namespace Gdiplus; // NOLINT using namespace Gdiplus::DllExports; // NOLINT diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index cb5ce771a3..d0359138de 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxge/fx_ge.h" +#include "core/fxge/include/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ @@ -12,9 +12,9 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/fx_ge_win32.h" #include "core/fxge/win32/win32_int.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/include/fxge/fx_ge_win32.h" #define SIZETHRESHOLD 1000 #define OUTPUTPSLEN 4096 diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 18996afc5c..7916690817 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -7,8 +7,8 @@ #ifndef CORE_FXGE_WIN32_WIN32_INT_H_ #define CORE_FXGE_WIN32_WIN32_INT_H_ +#include "core/fxge/include/fx_ge.h" #include "core/fxge/win32/dwrite_int.h" -#include "core/include/fxge/fx_ge.h" struct WINDIB_Open_Args_; class CGdiplusExt { |