Remove |alpha_flag| parameter to CFX_DIBitmap::CompositeMask().
It is always 0.
Change-Id: I440562261d0cfaf7f634e777c97a0534ca9e5bd2
Reviewed-on: https://pdfium-review.googlesource.com/c/51000
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 345bb6f..dd67ca4 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -1946,7 +1946,7 @@
pBitmap->CompositeMask(
point->x, point->y, glyph.m_pGlyph->GetBitmap()->GetWidth(),
glyph.m_pGlyph->GetBitmap()->GetHeight(), glyph.m_pGlyph->GetBitmap(),
- fill_argb, 0, 0, BlendMode::kNormal, nullptr, false, 0);
+ fill_argb, 0, 0, BlendMode::kNormal, nullptr, false);
}
m_pDevice->SetBitMask(pBitmap, rect.left, rect.top, fill_argb);
return true;
@@ -2314,7 +2314,7 @@
} else {
pScreen->CompositeMask(start_x, start_y, width, height,
pPatternBitmap, fill_argb, 0, 0,
- BlendMode::kNormal, nullptr, false, 0);
+ BlendMode::kNormal, nullptr, false);
}
}
}
@@ -2442,7 +2442,7 @@
if (pDIBitmap->IsAlphaMask()) {
pClone->CompositeMask(0, 0, pClone->GetWidth(), pClone->GetHeight(),
pDIBitmap, mask_argb, left, top, blend_mode,
- nullptr, false, 0);
+ nullptr, false);
} else {
pClone->CompositeBitmap(0, 0, pClone->GetWidth(), pClone->GetHeight(),
pDIBitmap, left, top, blend_mode, nullptr,
@@ -2475,7 +2475,7 @@
pBackdrop->CompositeMask(left - back_left, top - back_top,
pDIBitmap->GetWidth(), pDIBitmap->GetHeight(),
pDIBitmap, mask_argb, 0, 0, blend_mode, nullptr,
- false, 0);
+ false);
} else {
pBackdrop->CompositeBitmap(left - back_left, top - back_top,
pDIBitmap->GetWidth(), pDIBitmap->GetHeight(),
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 3f306a5..a735d67 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1439,7 +1439,7 @@
draw_rect.Height(), m_pClipRgn->GetMask(),
fill_color, draw_rect.left - clip_rect.left,
draw_rect.top - clip_rect.top, BlendMode::kNormal,
- nullptr, m_bRgbByteOrder, 0);
+ nullptr, m_bRgbByteOrder);
return true;
}
@@ -1504,7 +1504,7 @@
return m_pBitmap->CompositeMask(left, top, src_rect.Width(),
src_rect.Height(), pBitmap, argb,
src_rect.left, src_rect.top, blend_type,
- m_pClipRgn.get(), m_bRgbByteOrder, 0);
+ m_pClipRgn.get(), m_bRgbByteOrder);
}
return m_pBitmap->CompositeBitmap(
left, top, src_rect.Width(), src_rect.Height(), pBitmap, src_rect.left,
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index dfb7f0d..e313191 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -1035,7 +1035,7 @@
if (anti_alias == FXFT_RENDER_MODE_NORMAL) {
if (!bitmap->CompositeMask(point.value().x, point.value().y, ncols, nrows,
pGlyph, fill_color, 0, 0, BlendMode::kNormal,
- nullptr, false, 0)) {
+ nullptr, false)) {
return false;
}
continue;
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index b27a75f..f351622 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -939,8 +939,7 @@
int src_top,
BlendMode blend_type,
const CFX_ClipRgn* pClipRgn,
- bool bRgbByteOrder,
- int alpha_flag) {
+ bool bRgbByteOrder) {
if (!m_pBuffer)
return false;
@@ -954,8 +953,7 @@
return true;
}
- int src_alpha =
- (uint8_t)(alpha_flag >> 8) ? (alpha_flag & 0xff) : FXARGB_A(color);
+ int src_alpha = FXARGB_A(color);
if (src_alpha == 0)
return true;
@@ -970,8 +968,7 @@
int Bpp = GetBPP() / 8;
CFX_ScanlineCompositor compositor;
if (!compositor.Init(GetFormat(), pMask->GetFormat(), width, nullptr, color,
- blend_type, pClipMask != nullptr, bRgbByteOrder,
- alpha_flag)) {
+ blend_type, pClipMask != nullptr, bRgbByteOrder, 0)) {
return false;
}
for (int row = 0; row < height; row++) {
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index 58f69ed..db00e26 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -82,8 +82,7 @@
int src_top,
BlendMode blend_type,
const CFX_ClipRgn* pClipRgn,
- bool bRgbByteOrder,
- int alpha_flag);
+ bool bRgbByteOrder);
bool CompositeRect(int dest_left,
int dest_top,
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 21e4eb2..6f58215 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -102,7 +102,7 @@
m_pDevice->CompositeMask(
m_pTransformer->result().left, m_pTransformer->result().top,
pBitmap->GetWidth(), pBitmap->GetHeight(), pBitmap, m_MaskColor, 0, 0,
- BlendMode::kNormal, m_pClipRgn.Get(), m_bRgbByteOrder, 0);
+ BlendMode::kNormal, m_pClipRgn.Get(), m_bRgbByteOrder);
} else {
if (m_BitmapAlpha != 255)
pBitmap->MultiplyAlpha(m_BitmapAlpha);
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 30abcff..4643aaa 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2262,7 +2262,7 @@
return m_pBitmap->CompositeMask(left, top, src_rect.Width(),
src_rect.Height(), pBitmap, argb,
src_rect.left, src_rect.top, blend_type,
- m_pClipRgn.get(), m_bRgbByteOrder, 0);
+ m_pClipRgn.get(), m_bRgbByteOrder);
}
return m_pBitmap->CompositeBitmap(
left, top, src_rect.Width(), src_rect.Height(), pBitmap, src_rect.left,
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index e0df353..90d1d45 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -1200,7 +1200,7 @@
if (!background->Create(width, height, FXDIB_Rgb32) ||
!GetDIBits(background, left, top) ||
!background->CompositeMask(0, 0, width, height, pSource, color, 0, 0,
- BlendMode::kNormal, nullptr, false, 0)) {
+ BlendMode::kNormal, nullptr, false)) {
return false;
}
FX_RECT alpha_src_rect(0, 0, width, height);
@@ -1299,7 +1299,7 @@
image_rect.top + clip_rect.top) ||
!background->CompositeMask(0, 0, clip_width, clip_height, pStretched,
color, 0, 0, BlendMode::kNormal, nullptr,
- false, 0)) {
+ false)) {
return false;
}
