Fix 19 ClangTidy - Readability/Naming findings in core/fxge/
These fixes are automatically created by various analysis tools, but
have been manually triggered to be applied. See go/code-findings-fixes.
* function 'CFX_AggDeviceDriver::SetDIBits' has a definition with
different parameter names
* function 'CFX_AggDeviceDriver::StretchDIBits' has a definition with
different parameter names
* function 'CFX_AggDeviceDriver::StartDIBits' has a definition with
different parameter names
* function 'CFX_ClipRgn::IntersectMaskRect' has a definition with
different parameter names
* function 'CFX_Color::ConvertColorType' has a definition with different
parameter names
* function 'CFX_FontMapper::FindSubstFont' has a definition with
different parameter names
* function 'CFX_FontMapper::UseInternalSubst' has a definition with
different parameter names
* function 'CFX_GraphStateData::operator=' has a definition with
different parameter names (2 times)
* function 'CFX_PathData::AppendPoint' has a definition with different
parameter names
* function 'CFX_RenderDevice::SetDIBitsWithBlend' has a definition with
different parameter names
* function 'CFX_RenderDevice::StretchDIBitsWithFlagsAndBlend' has a
definition with different parameter names
* function 'CFX_RenderDevice::SetBitMask' has a definition with
different parameter names
* function 'CFX_RenderDevice::StretchBitMaskWithFlags' has a definition
with different parameter names
* function 'CFX_RenderDevice::StartDIBitsWithBlend' has a definition
with different parameter names
* function 'CFX_DIBitmap::MultiplyAlpha' has a definition with different
parameter names
* function 'StringToFXARGB' has a definition with different parameter
names
* function '(anonymous namespace)::CFX_LinuxFontInfo::MapFont' has a
definition with different parameter names
* function 'CFX_FolderFontInfo::MapFont' has a definition with different
parameter names
PiperOrigin-RevId: 254760131
Change-Id: Ifc9e35935ebcc950d7ca32ebaa13238bd4dbe9a3
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/56831
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 7104e21..0fe10a4 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -70,13 +70,13 @@
int top) override;
RetainPtr<CFX_DIBitmap> GetBackDrop() override;
bool SetDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
- uint32_t color,
+ uint32_t argb,
const FX_RECT& src_rect,
int left,
int top,
BlendMode blend_type) override;
- bool StretchDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
- uint32_t color,
+ bool StretchDIBits(const RetainPtr<CFX_DIBBase>& pSource,
+ uint32_t argb,
int dest_left,
int dest_top,
int dest_width,
@@ -84,9 +84,9 @@
const FX_RECT* pClipRect,
const FXDIB_ResampleOptions& options,
BlendMode blend_type) override;
- bool StartDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
+ bool StartDIBits(const RetainPtr<CFX_DIBBase>& pSource,
int bitmap_alpha,
- uint32_t color,
+ uint32_t argb,
const CFX_Matrix& matrix,
const FXDIB_ResampleOptions& options,
std::unique_ptr<CFX_ImageRenderer>* handle,
diff --git a/core/fxge/cfx_cliprgn.h b/core/fxge/cfx_cliprgn.h
index 0087739..e1f9e22 100644
--- a/core/fxge/cfx_cliprgn.h
+++ b/core/fxge/cfx_cliprgn.h
@@ -29,7 +29,7 @@
private:
void IntersectMaskRect(FX_RECT rect,
- FX_RECT mask_box,
+ FX_RECT mask_rect,
const RetainPtr<CFX_DIBitmap>& Mask);
ClipType m_Type;
diff --git a/core/fxge/cfx_color.h b/core/fxge/cfx_color.h
index 46893b9..fc941db 100644
--- a/core/fxge/cfx_color.h
+++ b/core/fxge/cfx_color.h
@@ -39,7 +39,7 @@
CFX_Color operator/(float fColorDivide) const;
CFX_Color operator-(float fColorSub) const;
- CFX_Color ConvertColorType(int32_t other_nColorType) const;
+ CFX_Color ConvertColorType(int32_t nConvertColorType) const;
FX_COLORREF ToFXColor(int32_t nTransparency) const;
diff --git a/core/fxge/cfx_folderfontinfo.h b/core/fxge/cfx_folderfontinfo.h
index e30f298..2781715 100644
--- a/core/fxge/cfx_folderfontinfo.h
+++ b/core/fxge/cfx_folderfontinfo.h
@@ -28,7 +28,7 @@
bool bItalic,
int charset,
int pitch_family,
- const char* face) override;
+ const char* family) override;
#ifdef PDF_ENABLE_XFA
void* MapFontByUnicode(uint32_t dwUnicode,
int weight,
diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index d803a3a..2cf2ebb 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -386,7 +386,7 @@
uint32_t flags,
int weight,
int italic_angle,
- int WindowCP,
+ int CharsetCP,
CFX_SubstFont* pSubstFont) {
if (weight == 0)
weight = FXFONT_FW_NORMAL;
@@ -523,8 +523,8 @@
}
int Charset = FX_CHARSET_ANSI;
- if (WindowCP)
- Charset = FX_GetCharsetFromCodePage(WindowCP);
+ if (CharsetCP)
+ Charset = FX_GetCharsetFromCodePage(CharsetCP);
else if (iBaseFont == kNumStandardFonts && FontStyleIsSymbolic(flags))
Charset = FX_CHARSET_Symbol;
const bool bCJK = FX_CharSetIsCJK(Charset);
diff --git a/core/fxge/cfx_fontmapper.h b/core/fxge/cfx_fontmapper.h
index 682b4c5..89bdfb4 100644
--- a/core/fxge/cfx_fontmapper.h
+++ b/core/fxge/cfx_fontmapper.h
@@ -76,7 +76,7 @@
int iBaseFont,
int italic_angle,
int weight,
- int picthfamily);
+ int pitch_family);
RetainPtr<CFX_Face> GetCachedTTCFace(void* hFont,
uint32_t ttc_size,
uint32_t font_size);
diff --git a/core/fxge/cfx_graphstatedata.h b/core/fxge/cfx_graphstatedata.h
index b49d0cb..e8ece9f 100644
--- a/core/fxge/cfx_graphstatedata.h
+++ b/core/fxge/cfx_graphstatedata.h
@@ -31,8 +31,8 @@
CFX_GraphStateData(CFX_GraphStateData&& src);
~CFX_GraphStateData();
- CFX_GraphStateData& operator=(const CFX_GraphStateData& src);
- CFX_GraphStateData& operator=(CFX_GraphStateData&& src);
+ CFX_GraphStateData& operator=(const CFX_GraphStateData& that);
+ CFX_GraphStateData& operator=(CFX_GraphStateData&& that);
LineCap m_LineCap = LineCapButt;
LineJoin m_LineJoin = LineJoinMiter;
diff --git a/core/fxge/cfx_pathdata.h b/core/fxge/cfx_pathdata.h
index 3f176be..8a18d82 100644
--- a/core/fxge/cfx_pathdata.h
+++ b/core/fxge/cfx_pathdata.h
@@ -65,7 +65,7 @@
void AppendRect(const CFX_FloatRect& rect);
void AppendRect(float left, float bottom, float right, float top);
void AppendLine(const CFX_PointF& pt1, const CFX_PointF& pt2);
- void AppendPoint(const CFX_PointF& pos, FXPT_TYPE type, bool closeFigure);
+ void AppendPoint(const CFX_PointF& point, FXPT_TYPE type, bool closeFigure);
void ClosePath();
private:
diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h
index 437d270..a20df32 100644
--- a/core/fxge/cfx_renderdevice.h
+++ b/core/fxge/cfx_renderdevice.h
@@ -105,7 +105,7 @@
bool SetDIBitsWithBlend(const RetainPtr<CFX_DIBBase>& pBitmap,
int left,
int top,
- BlendMode blend_type);
+ BlendMode blend_mode);
bool StretchDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
int left,
int top,
@@ -121,11 +121,11 @@
int dest_width,
int dest_height,
const FXDIB_ResampleOptions& options,
- BlendMode blend_type);
+ BlendMode blend_mode);
bool SetBitMask(const RetainPtr<CFX_DIBBase>& pBitmap,
int left,
int top,
- uint32_t color);
+ uint32_t argb);
bool StretchBitMask(const RetainPtr<CFX_DIBBase>& pBitmap,
int left,
int top,
@@ -137,7 +137,7 @@
int top,
int dest_width,
int dest_height,
- uint32_t color,
+ uint32_t argb,
const FXDIB_ResampleOptions& options);
bool StartDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
int bitmap_alpha,
@@ -150,11 +150,11 @@
}
bool StartDIBitsWithBlend(const RetainPtr<CFX_DIBBase>& pBitmap,
int bitmap_alpha,
- uint32_t color,
+ uint32_t argb,
const CFX_Matrix& matrix,
const FXDIB_ResampleOptions& options,
std::unique_ptr<CFX_ImageRenderer>* handle,
- BlendMode blend_type);
+ BlendMode blend_mode);
bool ContinueDIBits(CFX_ImageRenderer* handle, PauseIndicatorIface* pPause);
bool DrawNormalText(int nChars,
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index db00e26..45d2031 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -51,7 +51,7 @@
bool LoadChannel(FXDIB_Channel destChannel, int value);
bool MultiplyAlpha(int alpha);
- bool MultiplyAlpha(const RetainPtr<CFX_DIBBase>& pAlphaMask);
+ bool MultiplyAlpha(const RetainPtr<CFX_DIBBase>& pSrcBitmap);
bool TransferBitmap(int dest_left,
int dest_top,
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 8d4d592..4b3510e 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -104,14 +104,14 @@
FXSYS_GetBValue(colorref));
}
-FX_ARGB StringToFXARGB(WideStringView wsValue) {
+FX_ARGB StringToFXARGB(WideStringView view) {
static constexpr FX_ARGB kDefaultValue = 0xff000000;
- if (wsValue.GetLength() == 0)
+ if (view.GetLength() == 0)
return kDefaultValue;
int cc = 0;
- const wchar_t* str = wsValue.unterminated_c_str();
- int len = wsValue.GetLength();
+ const wchar_t* str = view.unterminated_c_str();
+ int len = view.GetLength();
while (cc < len && FXSYS_iswspace(str[cc]))
cc++;
diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp
index ddde4a6..38d99b8 100644
--- a/core/fxge/fx_ge_linux.cpp
+++ b/core/fxge/fx_ge_linux.cpp
@@ -88,15 +88,15 @@
bool bItalic,
int charset,
int pitch_family,
- const char* cstr_face) {
- void* font = GetSubstFont(cstr_face);
+ const char* family) {
+ void* font = GetSubstFont(family);
if (font)
return font;
bool bCJK = true;
switch (charset) {
case FX_CHARSET_ShiftJIS: {
- uint8_t index = GetJapanesePreference(cstr_face, weight, pitch_family);
+ uint8_t index = GetJapanesePreference(family, weight, pitch_family);
ASSERT(index < FX_ArraySize(g_LinuxJpFontList));
for (const char* name : g_LinuxJpFontList[index]) {
auto it = m_FontList.find(name);
@@ -133,7 +133,7 @@
bCJK = false;
break;
}
- return FindFont(weight, bItalic, charset, pitch_family, cstr_face, !bCJK);
+ return FindFont(weight, bItalic, charset, pitch_family, family, !bCJK);
}
bool CFX_LinuxFontInfo::ParseFontCfg(const char** pUserPaths) {
