Make RenderDeviceDriverIface::MultiplyAlphaMask() parameter more const
Be consistent with CFX_DIBitmap::MultiplyAlphaMask(). Also update
RenderDeviceDriverIface implementations as well as CFX_RenderDevice.
Change-Id: If44e2c3aee940c94c4b298325f4938fa552c2196
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/115420
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 3d68600..6edad47 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1135,7 +1135,7 @@
}
bool CFX_AggDeviceDriver::MultiplyAlphaMask(
- const RetainPtr<CFX_DIBBase>& mask) {
+ const RetainPtr<const CFX_DIBBase>& mask) {
return m_pBitmap->MultiplyAlphaMask(mask);
}
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index db4a9a0..c82f0a4 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -99,7 +99,7 @@
const CFX_TextRenderOptions& options) override;
int GetDriverType() const override;
bool MultiplyAlpha(float alpha) override;
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) override;
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) override;
void Clear(uint32_t color);
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 80596b7..a5fb5e1 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -1464,7 +1464,8 @@
return m_pDeviceDriver->MultiplyAlpha(alpha);
}
-bool CFX_RenderDevice::MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) {
+bool CFX_RenderDevice::MultiplyAlphaMask(
+ const RetainPtr<const CFX_DIBBase>& mask) {
return m_pDeviceDriver->MultiplyAlphaMask(mask);
}
diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h
index 4c1d64d..d67cb06 100644
--- a/core/fxge/cfx_renderdevice.h
+++ b/core/fxge/cfx_renderdevice.h
@@ -215,7 +215,7 @@
bool MultiplyAlpha(float alpha);
// Multiplies the device by an alpha mask, returning `true` on success.
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask);
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask);
#if defined(PDF_USE_SKIA)
bool SetBitsWithMask(const RetainPtr<CFX_DIBBase>& pBitmap,
diff --git a/core/fxge/renderdevicedriver_iface.h b/core/fxge/renderdevicedriver_iface.h
index adc10d2..ffb68a3 100644
--- a/core/fxge/renderdevicedriver_iface.h
+++ b/core/fxge/renderdevicedriver_iface.h
@@ -127,7 +127,7 @@
virtual bool MultiplyAlpha(float alpha) = 0;
// Multiplies the device by an alpha mask, returning `true` on success.
- virtual bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) = 0;
+ virtual bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) = 0;
};
#endif // CORE_FXGE_RENDERDEVICEDRIVER_IFACE_H_
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index e2e88c9..b0b211e 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -961,7 +961,7 @@
}
bool CFX_SkiaDeviceDriver::MultiplyAlphaMask(
- const RetainPtr<CFX_DIBBase>& mask) {
+ const RetainPtr<const CFX_DIBBase>& mask) {
CHECK(mask->IsMaskFormat());
sk_sp<SkImage> skia_mask = mask->RealizeSkImage();
diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index d455e43..6ce4bd8 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -153,7 +153,7 @@
bool bAlphaMode) override;
bool MultiplyAlpha(float alpha) override;
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) override;
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) override;
void Clear(uint32_t color);
void Dump() const;
diff --git a/core/fxge/win32/cgdi_device_driver.cpp b/core/fxge/win32/cgdi_device_driver.cpp
index dcc04f3..e22d4aa 100644
--- a/core/fxge/win32/cgdi_device_driver.cpp
+++ b/core/fxge/win32/cgdi_device_driver.cpp
@@ -545,7 +545,8 @@
return false;
}
-bool CGdiDeviceDriver::MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) {
+bool CGdiDeviceDriver::MultiplyAlphaMask(
+ const RetainPtr<const CFX_DIBBase>& mask) {
// Not implemented. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
NOTREACHED();
diff --git a/core/fxge/win32/cgdi_device_driver.h b/core/fxge/win32/cgdi_device_driver.h
index 6e8ff42..aca453c 100644
--- a/core/fxge/win32/cgdi_device_driver.h
+++ b/core/fxge/win32/cgdi_device_driver.h
@@ -48,7 +48,7 @@
BlendMode blend_type) override;
bool GetClipBox(FX_RECT* pRect) override;
bool MultiplyAlpha(float alpha) override;
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) override;
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) override;
void DrawLine(float x1, float y1, float x2, float y2);
diff --git a/core/fxge/win32/cps_printer_driver.cpp b/core/fxge/win32/cps_printer_driver.cpp
index 71678dc..2df6f28 100644
--- a/core/fxge/win32/cps_printer_driver.cpp
+++ b/core/fxge/win32/cps_printer_driver.cpp
@@ -217,7 +217,8 @@
return false;
}
-bool CPSPrinterDriver::MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) {
+bool CPSPrinterDriver::MultiplyAlphaMask(
+ const RetainPtr<const CFX_DIBBase>& mask) {
// PostScript doesn't support transparency. All callers are using
// `CFX_DIBitmap`-backed raster devices anyway.
NOTREACHED();
diff --git a/core/fxge/win32/cps_printer_driver.h b/core/fxge/win32/cps_printer_driver.h
index baf9a04..5de81b9 100644
--- a/core/fxge/win32/cps_printer_driver.h
+++ b/core/fxge/win32/cps_printer_driver.h
@@ -74,7 +74,7 @@
uint32_t color,
const CFX_TextRenderOptions& options) override;
bool MultiplyAlpha(float alpha) override;
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) override;
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) override;
HDC m_hDC;
int m_Width;
diff --git a/core/fxge/win32/ctext_only_printer_driver.cpp b/core/fxge/win32/ctext_only_printer_driver.cpp
index 6a69240..dd4d90d 100644
--- a/core/fxge/win32/ctext_only_printer_driver.cpp
+++ b/core/fxge/win32/ctext_only_printer_driver.cpp
@@ -188,7 +188,7 @@
}
bool CTextOnlyPrinterDriver::MultiplyAlphaMask(
- const RetainPtr<CFX_DIBBase>& mask) {
+ const RetainPtr<const CFX_DIBBase>& mask) {
// Not needed. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
NOTREACHED();
diff --git a/core/fxge/win32/ctext_only_printer_driver.h b/core/fxge/win32/ctext_only_printer_driver.h
index 3054fdb..a5c81d7 100644
--- a/core/fxge/win32/ctext_only_printer_driver.h
+++ b/core/fxge/win32/ctext_only_printer_driver.h
@@ -65,7 +65,7 @@
uint32_t color,
const CFX_TextRenderOptions& options) override;
bool MultiplyAlpha(float alpha) override;
- bool MultiplyAlphaMask(const RetainPtr<CFX_DIBBase>& mask) override;
+ bool MultiplyAlphaMask(const RetainPtr<const CFX_DIBBase>& mask) override;
HDC m_hDC;
const int m_Width;
