Rename CFX_BitmapComposer to CFX_AggBitmapComposer
Make it more obvious the class is only used with AGG.
Change-Id: Icc2d81df8ad80a9471ea617d561742cd61bdfef3
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/122194
Reviewed-by: Tom Sepez <tsepez@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/agg/cfx_agg_bitmapcomposer.cpp b/core/fxge/agg/cfx_agg_bitmapcomposer.cpp
index 3b37317..9431254 100644
--- a/core/fxge/agg/cfx_agg_bitmapcomposer.cpp
+++ b/core/fxge/agg/cfx_agg_bitmapcomposer.cpp
@@ -18,20 +18,20 @@
#include "core/fxge/cfx_cliprgn.h"
#include "core/fxge/dib/cfx_dibitmap.h"
-CFX_BitmapComposer::CFX_BitmapComposer() = default;
+CFX_AggBitmapComposer::CFX_AggBitmapComposer() = default;
-CFX_BitmapComposer::~CFX_BitmapComposer() = default;
+CFX_AggBitmapComposer::~CFX_AggBitmapComposer() = default;
-void CFX_BitmapComposer::Compose(const RetainPtr<CFX_DIBitmap>& pDest,
- const CFX_ClipRgn* pClipRgn,
- float alpha,
- uint32_t mask_color,
- const FX_RECT& dest_rect,
- bool bVertical,
- bool bFlipX,
- bool bFlipY,
- bool bRgbByteOrder,
- BlendMode blend_mode) {
+void CFX_AggBitmapComposer::Compose(const RetainPtr<CFX_DIBitmap>& pDest,
+ const CFX_ClipRgn* pClipRgn,
+ float alpha,
+ uint32_t mask_color,
+ const FX_RECT& dest_rect,
+ bool bVertical,
+ bool bFlipX,
+ bool bFlipY,
+ bool bRgbByteOrder,
+ BlendMode blend_mode) {
m_pBitmap = pDest;
m_pClipRgn = pClipRgn;
m_DestLeft = dest_rect.left;
@@ -50,10 +50,10 @@
m_BlendMode = blend_mode;
}
-bool CFX_BitmapComposer::SetInfo(int width,
- int height,
- FXDIB_Format src_format,
- DataVector<uint32_t> src_palette) {
+bool CFX_AggBitmapComposer::SetInfo(int width,
+ int height,
+ FXDIB_Format src_format,
+ DataVector<uint32_t> src_palette) {
DCHECK_NE(src_format, FXDIB_Format::k1bppMask);
DCHECK_NE(src_format, FXDIB_Format::k1bppRgb);
m_SrcFormat = src_format;
@@ -73,10 +73,10 @@
return true;
}
-void CFX_BitmapComposer::DoCompose(pdfium::span<uint8_t> dest_scan,
- pdfium::span<const uint8_t> src_scan,
- int dest_width,
- pdfium::span<const uint8_t> clip_scan) {
+void CFX_AggBitmapComposer::DoCompose(pdfium::span<uint8_t> dest_scan,
+ pdfium::span<const uint8_t> src_scan,
+ int dest_width,
+ pdfium::span<const uint8_t> clip_scan) {
if (m_Alpha != 1.0f) {
if (!clip_scan.empty()) {
for (int i = 0; i < dest_width; ++i) {
@@ -100,8 +100,9 @@
}
}
-void CFX_BitmapComposer::ComposeScanline(int line,
- pdfium::span<const uint8_t> scanline) {
+void CFX_AggBitmapComposer::ComposeScanline(
+ int line,
+ pdfium::span<const uint8_t> scanline) {
if (m_bVertical) {
ComposeScanlineV(line, scanline);
return;
@@ -127,7 +128,7 @@
DoCompose(dest_scan, scanline, m_DestWidth, clip_scan);
}
-void CFX_BitmapComposer::ComposeScanlineV(
+void CFX_AggBitmapComposer::ComposeScanlineV(
int line,
pdfium::span<const uint8_t> scanline) {
int Bpp = m_pBitmap->GetBPP() / 8;
diff --git a/core/fxge/agg/cfx_agg_bitmapcomposer.h b/core/fxge/agg/cfx_agg_bitmapcomposer.h
index bf4f68e..ac4ae91 100644
--- a/core/fxge/agg/cfx_agg_bitmapcomposer.h
+++ b/core/fxge/agg/cfx_agg_bitmapcomposer.h
@@ -20,10 +20,10 @@
class CFX_DIBitmap;
struct FX_RECT;
-class CFX_BitmapComposer final : public ScanlineComposerIface {
+class CFX_AggBitmapComposer final : public ScanlineComposerIface {
public:
- CFX_BitmapComposer();
- ~CFX_BitmapComposer() override;
+ CFX_AggBitmapComposer();
+ ~CFX_AggBitmapComposer() override;
void Compose(const RetainPtr<CFX_DIBitmap>& pDest,
const CFX_ClipRgn* pClipRgn,
diff --git a/core/fxge/agg/cfx_agg_imagerenderer.h b/core/fxge/agg/cfx_agg_imagerenderer.h
index d497ec0..c84412e 100644
--- a/core/fxge/agg/cfx_agg_imagerenderer.h
+++ b/core/fxge/agg/cfx_agg_imagerenderer.h
@@ -42,7 +42,7 @@
const CFX_Matrix m_Matrix;
std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
std::unique_ptr<CFX_ImageStretcher> m_Stretcher;
- CFX_BitmapComposer m_Composer;
+ CFX_AggBitmapComposer m_Composer;
FX_RECT m_ClipBox;
const float m_Alpha;
uint32_t m_MaskColor;
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 13f6768..98b3675 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1413,7 +1413,7 @@
dest_rect.Normalize();
FX_RECT dest_clip = dest_rect;
dest_clip.Intersect(*pClipRect);
- CFX_BitmapComposer composer;
+ CFX_AggBitmapComposer composer;
composer.Compose(m_pBitmap, m_pClipRgn.get(), /*alpha=*/1.0f, argb, dest_clip,
/*bVertical=*/false, /*bFlipX=*/false, /*bFlipY=*/false,
m_bRgbByteOrder, blend_type);
