Move CFX_ImageRenderer to core/fxge/agg Move core/fxge/dib/cfx_imagerenderer.* to core/fxge/agg/cfx_agg_imagerenderer.*, as this code is really only used by AGG. Renaming the class itself will be done soon after. Also use this move as an opportunity to adjust includes of cfx_agg_imagerenderer.h. Change-Id: I5037afa8cfed8eeee96a4cdbc8d4e30d7bd2379b Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/122150 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@google.com>

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index e7c45ca..e9f20a9 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp

@@ -34,6 +34,7 @@
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/maybe_owned.h"
 #include "core/fxcrt/zip.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_fillrenderoptions.h"
 #include "core/fxge/cfx_path.h"

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index eea78b7..4d09a2d 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h

@@ -13,17 +13,19 @@
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/fx_dib.h"
 
 class CFX_DIBBase;
+class CFX_DIBitmap;
 class CFX_DefaultRenderDevice;
+class CFX_ImageRenderer;
 class CFX_ImageTransformer;
 class CPDF_ImageLoader;
 class CPDF_ImageObject;
 class CPDF_Pattern;
 class CPDF_RenderOptions;
 class CPDF_RenderStatus;
+class PauseIndicatorIface;
 
 class CPDF_ImageRenderer {
  public:

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index febb9a5..bce08d5 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp

@@ -63,6 +63,7 @@
 #include "core/fxcrt/span.h"
 #include "core/fxcrt/stl_util.h"
 #include "core/fxcrt/unowned_ptr.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_fillrenderoptions.h"
 #include "core/fxge/cfx_glyphbitmap.h"

diff --git a/core/fxge/BUILD.gn b/core/fxge/BUILD.gn
index 215a63b..32e8bf6 100644
--- a/core/fxge/BUILD.gn
+++ b/core/fxge/BUILD.gn

@@ -8,6 +8,8 @@
 
 source_set("fxge") {
   sources = [
+    "agg/cfx_agg_imagerenderer.cpp",
+    "agg/cfx_agg_imagerenderer.h",
     "agg/fx_agg_driver.cpp",
     "agg/fx_agg_driver.h",
     "calculate_pitch.cpp",
@@ -64,8 +66,6 @@
     "dib/cfx_dibbase.h",
     "dib/cfx_dibitmap.cpp",
     "dib/cfx_dibitmap.h",
-    "dib/cfx_imagerenderer.cpp",
-    "dib/cfx_imagerenderer.h",
     "dib/cfx_imagestretcher.cpp",
     "dib/cfx_imagestretcher.h",
     "dib/cfx_imagetransformer.cpp",

diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/agg/cfx_agg_imagerenderer.cpp
similarity index 98%
rename from core/fxge/dib/cfx_imagerenderer.cpp
rename to core/fxge/agg/cfx_agg_imagerenderer.cpp
index 3d125c7..93a717f 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/agg/cfx_agg_imagerenderer.cpp

@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxge/dib/cfx_imagerenderer.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 
 #include <math.h>
 

diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/agg/cfx_agg_imagerenderer.h
similarity index 90%
rename from core/fxge/dib/cfx_imagerenderer.h
rename to core/fxge/agg/cfx_agg_imagerenderer.h
index 6ceeaf4..127cfc2 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/agg/cfx_agg_imagerenderer.h

@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_DIB_CFX_IMAGERENDERER_H_
-#define CORE_FXGE_DIB_CFX_IMAGERENDERER_H_
+#ifndef CORE_FXGE_AGG_CFX_AGG_IMAGERENDERER_H_
+#define CORE_FXGE_AGG_CFX_AGG_IMAGERENDERER_H_
 
 #include <memory>
 
@@ -50,4 +50,4 @@
   const bool m_bRgbByteOrder;
 };
 
-#endif  // CORE_FXGE_DIB_CFX_IMAGERENDERER_H_
+#endif  // CORE_FXGE_AGG_CFX_AGG_IMAGERENDERER_H_

diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 1ecde94..9f714df 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp

@@ -22,12 +22,12 @@
 #include "core/fxcrt/span.h"
 #include "core/fxcrt/stl_util.h"
 #include "core/fxcrt/unowned_ptr_exclusion.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_cliprgn.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 

diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 0d0a523..bbed92c 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp

@@ -30,7 +30,6 @@
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/cfx_textrenderoptions.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/fx_font.h"
 #include "core/fxge/renderdevicedriver_iface.h"
 #include "core/fxge/text_char_pos.h"

diff --git a/core/fxge/renderdevicedriver_iface.cpp b/core/fxge/renderdevicedriver_iface.cpp
index 98189f7..9ca8c72 100644
--- a/core/fxge/renderdevicedriver_iface.cpp
+++ b/core/fxge/renderdevicedriver_iface.cpp

@@ -9,9 +9,9 @@
 #include <utility>
 
 #include "core/fxcrt/fx_coordinates.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 
 RenderDeviceDriverIface::~RenderDeviceDriverIface() = default;
 

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 308f4c0..2cc5dc2 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp

@@ -38,6 +38,7 @@
 #include "core/fxcrt/ptr_util.h"
 #include "core/fxcrt/span.h"
 #include "core/fxcrt/stl_util.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_fillrenderoptions.h"
 #include "core/fxge/cfx_font.h"
@@ -47,7 +48,6 @@
 #include "core/fxge/cfx_substfont.h"
 #include "core/fxge/cfx_textrenderoptions.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cstretchengine.h"
 #include "core/fxge/dib/fx_dib.h"
 #include "core/fxge/text_char_pos.h"

diff --git a/core/fxge/win32/cgdi_display_driver.cpp b/core/fxge/win32/cgdi_display_driver.cpp
index a48c53b..0d4dd43 100644
--- a/core/fxge/win32/cgdi_display_driver.cpp
+++ b/core/fxge/win32/cgdi_display_driver.cpp

@@ -12,9 +12,9 @@
 #include "core/fxcrt/check_op.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/dib/cfx_dibbase.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/render_defines.h"
 #include "core/fxge/win32/cwin32_platform.h"
 

diff --git a/core/fxge/win32/cgdi_printer_driver.cpp b/core/fxge/win32/cgdi_printer_driver.cpp
index 530430d..8918a56 100644
--- a/core/fxge/win32/cgdi_printer_driver.cpp
+++ b/core/fxge/win32/cgdi_printer_driver.cpp

@@ -18,11 +18,11 @@
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_font.h"
 #include "core/fxge/cfx_windowsrenderdevice.h"
 #include "core/fxge/dib/cfx_dibbase.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/render_defines.h"
 #include "core/fxge/text_char_pos.h"
 

diff --git a/core/fxge/win32/cps_printer_driver.cpp b/core/fxge/win32/cps_printer_driver.cpp
index 8daa807..f7c121a 100644
--- a/core/fxge/win32/cps_printer_driver.cpp
+++ b/core/fxge/win32/cps_printer_driver.cpp

@@ -17,11 +17,11 @@
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/notreached.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_fillrenderoptions.h"
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/dib/cfx_dibbase.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/win32/cpsoutput.h"
 
 namespace {

diff --git a/core/fxge/win32/ctext_only_printer_driver.cpp b/core/fxge/win32/ctext_only_printer_driver.cpp
index c3fc2a0..8f20bd7 100644
--- a/core/fxge/win32/ctext_only_printer_driver.cpp
+++ b/core/fxge/win32/ctext_only_printer_driver.cpp

@@ -15,10 +15,10 @@
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/notreached.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_font.h"
 #include "core/fxge/dib/cfx_dibbase.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/text_char_pos.h"
 
 CTextOnlyPrinterDriver::CTextOnlyPrinterDriver(HDC hDC)

diff --git a/xfa/fxfa/cxfa_imagerenderer.cpp b/xfa/fxfa/cxfa_imagerenderer.cpp
index f26b674..40dbb70 100644
--- a/xfa/fxfa/cxfa_imagerenderer.cpp
+++ b/xfa/fxfa/cxfa_imagerenderer.cpp

@@ -10,10 +10,10 @@
 
 #include <utility>
 
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/dib/cfx_dibbase.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cfx_imagetransformer.h"
 
 CXFA_ImageRenderer::CXFA_ImageRenderer(CFX_RenderDevice* pDevice,