Remove unused argument from CXFA_FFWidget::IsMatchVisibleStatus()
It has been unused ever since XFA was merged into main. There may
have been some confusion between the |dwStatus| argument and the
|m_dwStatus| member, but looking at the call sites, it does not
appear that it would ever be called with an argument that would
cause true to be returned, and everything would be invisible as
a consequence.
Rename to HasVisibleStatus() to indicate that no match against
an argument is to be performed.
Change-Id: I356be74514a80182f91312f1dd5364e3303179b4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/53053
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp
index a832f14..c7380ad 100644
--- a/xfa/fxfa/cxfa_ffarc.cpp
+++ b/xfa/fxfa/cxfa_ffarc.cpp
@@ -16,7 +16,7 @@
void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CXFA_Value* value = m_pNode->GetFormValueIfExists();
@@ -29,6 +29,5 @@
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
-
DrawBorder(pGS, value->GetArcIfExists(), rtArc, mtRotate);
}
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index b43aeda..e4b814a 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -136,7 +136,7 @@
void CXFA_FFBarcode::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index fa30c71..a208e21 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -227,7 +227,7 @@
void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffexclgroup.cpp b/xfa/fxfa/cxfa_ffexclgroup.cpp
index 318752b..fe12cf4 100644
--- a/xfa/fxfa/cxfa_ffexclgroup.cpp
+++ b/xfa/fxfa/cxfa_ffexclgroup.cpp
@@ -18,7 +18,7 @@
void CXFA_FFExclGroup::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 7675de2..b12fbdd4 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -64,7 +64,7 @@
void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
index b78f851..23de617 100644
--- a/xfa/fxfa/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -35,7 +35,7 @@
void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index fbe4bb5..52feb5e 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -54,7 +54,7 @@
void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index 8bbe5a9..00552ea 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -85,7 +85,7 @@
void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CXFA_Value* value = m_pNode->GetFormValueIfExists();
@@ -96,7 +96,6 @@
float fLineWidth = 1.0f;
XFA_AttributeValue iStrokeType = XFA_AttributeValue::Unknown;
XFA_AttributeValue iCap = XFA_AttributeValue::Unknown;
-
CXFA_Line* line = value->GetLineIfExists();
if (line) {
CXFA_Edge* edge = line->GetEdgeIfExists();
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 1376289..366fd04 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -33,7 +33,7 @@
void CXFA_FFPushButton::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
index ba9b950..9a2635ba 100644
--- a/xfa/fxfa/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -16,7 +16,7 @@
void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CXFA_Value* value = m_pNode->GetFormValueIfExists();
@@ -29,6 +29,5 @@
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
-
DrawBorder(pGS, value->GetRectangleIfExists(), rect, mtRotate);
}
diff --git a/xfa/fxfa/cxfa_ffsignature.cpp b/xfa/fxfa/cxfa_ffsignature.cpp
index b2e5c6a..ab3f364 100644
--- a/xfa/fxfa/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/cxfa_ffsignature.cpp
@@ -23,7 +23,7 @@
void CXFA_FFSignature::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index 8e6cddb..b0803d9 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -26,7 +26,7 @@
void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 1db5c05..d3c60ae 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -295,7 +295,7 @@
void CXFA_FFWidget::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
uint32_t dwStatus) {
- if (!IsMatchVisibleStatus(dwStatus))
+ if (!HasVisibleStatus())
return;
CXFA_Border* border = m_pNode->GetBorderIfExists();
@@ -305,7 +305,6 @@
CFX_RectF rtBorder = GetRectWithoutRotate();
CXFA_Margin* margin = border->GetMarginIfExists();
XFA_RectWithoutMargin(&rtBorder, margin);
-
rtBorder.Normalize();
DrawBorder(pGS, border, rtBorder, matrix);
}
@@ -597,7 +596,7 @@
return GetApp()->GetAppProvider();
}
-bool CXFA_FFWidget::IsMatchVisibleStatus(uint32_t dwStatus) {
+bool CXFA_FFWidget::HasVisibleStatus() const {
return !!(GetLayoutItem()->m_dwStatus & XFA_WidgetStatus_Visible);
}
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 02a9baa..61f3756 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -161,7 +161,7 @@
bool forceRound);
CFX_RectF GetRectWithoutRotate();
- bool IsMatchVisibleStatus(uint32_t dwStatus);
+ bool HasVisibleStatus() const;
void EventKillFocus();
bool IsButtonDown();
void SetButtonDown(bool bSet);
