From 92e2276a8be492fd2be8e44a5d62e8a5879644d8 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 10 Jul 2017 15:14:26 -0400 Subject: Move core/fxge/ge to core/fxge. This brings the cpp and h files together and removes the redundant ge/ path. Change-Id: I36594b8ae719d362768ba4c2e4ce173e287363eb Reviewed-on: https://pdfium-review.googlesource.com/7452 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- core/fxge/apple/fx_apple_platform.cpp | 4 ++-- core/fxge/apple/fx_mac_imp.cpp | 2 +- core/fxge/apple/fx_quartz_device.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fxge/apple') diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 1a56b183cf..56b15b35d0 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -13,12 +13,12 @@ #endif #include "core/fxge/apple/apple_int.h" +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/cfx_facecache.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_freetype.h" -#include "core/fxge/ge/cfx_cliprgn.h" -#include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/fx_text_int.h" #ifndef _SKIA_SUPPORT_ diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index ced08d2776..78fe16459c 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -9,8 +9,8 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxge/apple/apple_int.h" +#include "core/fxge/cfx_folderfontinfo.h" #include "core/fxge/cfx_gemodule.h" -#include "core/fxge/ge/cfx_folderfontinfo.h" #include "core/fxge/ifx_systemfontinfo.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index ad09f91f61..f92db2b30b 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -15,7 +15,7 @@ #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_freetype.h" -#include "core/fxge/ge/fx_text_int.h" +#include "core/fxge/fx_text_int.h" #include "third_party/base/ptr_util.h" #include "core/fxge/apple/apple_int.h" -- cgit v1.2.3