Resolves the following 11 technical debt issues:
function 'CPDF_ToUnicodeMap::GetUnicodeCountByCharcodeForTesting' has a
definition with different parameter names
(readability-inconsistent-declaration-parameter-name)
core/fpdfapi/font/cpdf_tounicodemap.h
function 'CPDF_RenderStatus::GetBackdrop' has a definition with
different parameter names
(readability-inconsistent-declaration-parameter-name)
core/fpdfapi/render/cpdf_renderstatus.h
function 'IFX_SeekableWriteStream::WriteBlock' has a definition with
different parameter names
(readability-inconsistent-declaration-parameter-name)
core/fxcrt/fx_stream.h
function 'CFFL_FormField::SetFocusForAnnot' has a definition with
different parameter names
(readability-inconsistent-declaration-parameter-name)
fpdfsdk/formfiller/cffl_formfield.h
function 'CFFL_FormField::OnDraw' has a definition with different
parameter names (readability-inconsistent-declaration-parameter-name)
fpdfsdk/formfiller/cffl_formfield.h
function 'CFFL_FormField::OnDrawDeactive' has a definition with
different parameter names
(readability-inconsistent-declaration-parameter-name)
fpdfsdk/formfiller/cffl_formfield.h
function 'CFFL_InteractiveFormFiller::GetFormField' has a definition
with different parameter names
(readability-inconsistent-declaration-parameter-name)
fpdfsdk/formfiller/cffl_interactiveformfiller.h
function 'CPWL_CBListBox::OnMovementKeyDown' has a definition with
different parameter names
(readability-inconsistent-declaration-parameter-name)
fpdfsdk/pwl/cpwl_cblistbox.h
function 'CPWL_ComboBox::OnKeyDown' has a definition with different
parameter names (readability-inconsistent-declaration-parameter-name)
fpdfsdk/pwl/cpwl_combo_box.h
function 'CPWL_Edit::OnKeyDown' has a definition with different
parameter names (readability-inconsistent-declaration-parameter-name)
fpdfsdk/pwl/cpwl_edit.h
function 'CPWL_EditImpl::DrawEdit' has a definition with different
parameter names (readability-inconsistent-declaration-parameter-name)
fpdfsdk/pwl/cpwl_edit_impl.h
PiperOrigin-RevId: 501661657
Change-Id: I22edc27b492c5d654e3bbaccbc53737afd54f21b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103250
Commit-Queue: Andrew Weintraub <asweintraub@google.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/font/cpdf_tounicodemap.h b/core/fpdfapi/font/cpdf_tounicodemap.h
index 9cbd7e6..a074f45 100644
--- a/core/fpdfapi/font/cpdf_tounicodemap.h
+++ b/core/fpdfapi/font/cpdf_tounicodemap.h
@@ -28,7 +28,7 @@
WideString Lookup(uint32_t charcode) const;
uint32_t ReverseLookup(wchar_t unicode) const;
- size_t GetUnicodeCountByCharcodeForTesting(uint32_t cid) const;
+ size_t GetUnicodeCountByCharcodeForTesting(uint32_t charcode) const;
private:
friend class cpdf_tounicodemap_StringToCode_Test;
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 65783b4..76596f0 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -167,7 +167,7 @@
const CFX_Matrix& mtObj2Device);
FX_RECT GetClippedBBox(const FX_RECT& rect) const;
RetainPtr<CFX_DIBitmap> GetBackdrop(const CPDF_PageObject* pObj,
- const FX_RECT& rect,
+ const FX_RECT& bbox,
bool bBackAlphaRequired);
RetainPtr<CFX_DIBitmap> LoadSMask(CPDF_Dictionary* pSMaskDict,
FX_RECT* pClipRect,
diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h
index 46d7de9..e6f1f55 100644
--- a/core/fxcrt/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -46,7 +46,7 @@
public IFX_RetainableWriteStream {
public:
// IFX_WriteStream:
- bool WriteBlock(pdfium::span<const uint8_t> data) override;
+ bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
virtual bool Flush() = 0;
virtual bool WriteBlockAtOffset(pdfium::span<const uint8_t> data,
diff --git a/fpdfsdk/formfiller/cffl_formfield.h b/fpdfsdk/formfiller/cffl_formfield.h
index f5a0fd1..bceb9b0 100644
--- a/fpdfsdk/formfiller/cffl_formfield.h
+++ b/fpdfsdk/formfiller/cffl_formfield.h
@@ -31,11 +31,11 @@
~CFFL_FormField() override;
virtual void OnDraw(CPDFSDK_PageView* pPageView,
- CPDFSDK_Widget* pAnnot,
+ CPDFSDK_Widget* pWidget,
CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device);
virtual void OnDrawDeactive(CPDFSDK_PageView* pPageView,
- CPDFSDK_Widget* pAnnot,
+ CPDFSDK_Widget* pWidget,
CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device);
@@ -86,7 +86,7 @@
bool Undo();
bool Redo();
- void SetFocusForAnnot(CPDFSDK_Widget* pAnnot, Mask<FWL_EVENTFLAG> nFlag);
+ void SetFocusForAnnot(CPDFSDK_Widget* pWidget, Mask<FWL_EVENTFLAG> nFlag);
void KillFocusForAnnot(Mask<FWL_EVENTFLAG> nFlag);
// CFX_Timer::CallbackIface:
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index 9b5eb9f..cbfa695 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -202,7 +202,7 @@
#endif // PDF_ENABLE_XFA
bool IsFillingAllowed(CPDFSDK_Widget* pWidget) const;
- CFFL_FormField* GetFormField(CPDFSDK_Widget* pAnnot);
+ CFFL_FormField* GetFormField(CPDFSDK_Widget* pWidget);
CFFL_FormField* GetOrCreateFormField(CPDFSDK_Widget* pWidget);
void UnregisterFormField(CPDFSDK_Widget* pWidget);
diff --git a/fpdfsdk/pwl/cpwl_cblistbox.h b/fpdfsdk/pwl/cpwl_cblistbox.h
index 3d56519..0f97edd 100644
--- a/fpdfsdk/pwl/cpwl_cblistbox.h
+++ b/fpdfsdk/pwl/cpwl_cblistbox.h
@@ -24,7 +24,7 @@
bool OnLButtonUp(Mask<FWL_EVENTFLAG> nFlag, const CFX_PointF& point) override;
bool IsMovementKey(FWL_VKEYCODE nKeyCode) const;
- bool OnMovementKeyDown(FWL_VKEYCODE nKyeCode, Mask<FWL_EVENTFLAG> nFlag);
+ bool OnMovementKeyDown(FWL_VKEYCODE nKeyCode, Mask<FWL_EVENTFLAG> nFlag);
bool IsChar(uint16_t nChar, Mask<FWL_EVENTFLAG> nFlag) const;
bool OnCharNotify(uint16_t nChar, Mask<FWL_EVENTFLAG> nFlag);
};
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index 480da52..6d74a97 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -29,7 +29,7 @@
// CPWL_Wnd:
void OnDestroy() override;
- bool OnKeyDown(FWL_VKEYCODE nChar, Mask<FWL_EVENTFLAG> nFlag) override;
+ bool OnKeyDown(FWL_VKEYCODE nKeyCode, Mask<FWL_EVENTFLAG> nFlag) override;
bool OnChar(uint16_t nChar, Mask<FWL_EVENTFLAG> nFlag) override;
void NotifyLButtonDown(CPWL_Wnd* child, const CFX_PointF& pos) override;
void NotifyLButtonUp(CPWL_Wnd* child, const CFX_PointF& pos) override;
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index c441fb7..c879148 100644
--- a/fpdfsdk/pwl/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -40,7 +40,7 @@
bool OnMouseWheel(Mask<FWL_EVENTFLAG> nFlag,
const CFX_PointF& point,
const CFX_Vector& delta) override;
- bool OnKeyDown(FWL_VKEYCODE nChar, Mask<FWL_EVENTFLAG> nFlag) override;
+ bool OnKeyDown(FWL_VKEYCODE nKeyCode, Mask<FWL_EVENTFLAG> nFlag) override;
bool OnChar(uint16_t nChar, Mask<FWL_EVENTFLAG> nFlag) override;
CFX_FloatRect GetFocusRect() const override;
void OnSetFocus() override;
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index f958f22..b4735c6 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -51,8 +51,8 @@
const CFX_FloatRect& rcClip,
const CFX_PointF& ptOffset,
const CPVT_WordRange* pRange,
- IPWL_FillerNotify* pHandler,
- IPWL_FillerNotify::PerWindowData* pWindowData);
+ IPWL_FillerNotify* pFillerNotify,
+ IPWL_FillerNotify::PerWindowData* pSystemData);
void SetFontMap(IPVT_FontMap* pFontMap);
void SetNotify(CPWL_Edit* pNotify);
