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/dib/cfx_bitmapcomposer.cpp | 2 +- core/fxge/dib/cfx_dibitmap.cpp | 2 +- core/fxge/dib/cfx_dibsource.cpp | 2 +- core/fxge/dib/cfx_imagerenderer.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fxge/dib') diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/dib/cfx_bitmapcomposer.cpp index 3f75fae1b6..8664606645 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.cpp +++ b/core/fxge/dib/cfx_bitmapcomposer.cpp @@ -7,8 +7,8 @@ #include "core/fxge/dib/cfx_bitmapcomposer.h" #include "core/fxcodec/fx_codec.h" +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_dibitmap.h" -#include "core/fxge/ge/cfx_cliprgn.h" CFX_BitmapComposer::CFX_BitmapComposer() : m_bRgbByteOrder(false), m_BlendType(FXDIB_BLEND_NORMAL) {} diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp index 43b0da0edf..02c3543c85 100644 --- a/core/fxge/dib/cfx_dibitmap.cpp +++ b/core/fxge/dib/cfx_dibitmap.cpp @@ -11,8 +11,8 @@ #include #include "core/fxcodec/fx_codec.h" +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_scanlinecompositor.h" -#include "core/fxge/ge/cfx_cliprgn.h" #include "third_party/base/ptr_util.h" #define MAX_OOM_LIMIT 12000000 diff --git a/core/fxge/dib/cfx_dibsource.cpp b/core/fxge/dib/cfx_dibsource.cpp index 458baa56ca..e19619df1d 100644 --- a/core/fxge/dib/cfx_dibsource.cpp +++ b/core/fxge/dib/cfx_dibsource.cpp @@ -12,11 +12,11 @@ #include #include "core/fxcodec/fx_codec.h" +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_bitmapstorer.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_imagestretcher.h" #include "core/fxge/dib/cfx_imagetransformer.h" -#include "core/fxge/ge/cfx_cliprgn.h" #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp index db3fe02bd5..6448014ba5 100644 --- a/core/fxge/dib/cfx_imagerenderer.cpp +++ b/core/fxge/dib/cfx_imagerenderer.cpp @@ -8,9 +8,9 @@ #include +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_imagestretcher.h" #include "core/fxge/dib/cfx_imagetransformer.h" -#include "core/fxge/ge/cfx_cliprgn.h" #include "third_party/base/ptr_util.h" CFX_ImageRenderer::CFX_ImageRenderer( -- cgit v1.2.3