Remove CFX_RectF::Reset().
Most uses are redundant given default constructor, and the remaining
one are better served by assignment.
Move initializations to headers and repack as encountered.
Remove |dw| prefix from member struct as encountered.
Change-Id: I647b7f746e5ebd08ce0773c080806c03951929c5
Reviewed-on: https://pdfium-review.googlesource.com/c/47592
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h
index 3aa50ac..35dc893 100644
--- a/core/fxcrt/fx_coordinates.h
+++ b/core/fxcrt/fx_coordinates.h
@@ -345,12 +345,6 @@
width(other.width),
height(other.height) {}
- void Reset() {
- left = 0;
- top = 0;
- width = 0;
- height = 0;
- }
CFX_RectF& operator+=(const PointType& p) {
left += p.x;
top += p.y;
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
index 7e06228..1529062 100644
--- a/xfa/fwl/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -30,15 +30,8 @@
} // namespace
CFWL_CheckBox::CFWL_CheckBox(const CFWL_App* app)
- : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
- m_iTTOAlign(FDE_TextAlignment::kCenter),
- m_bBtnDown(false),
- m_fBoxHeight(16.0f) {
- m_dwTTOStyles.single_line_ = true;
- m_rtClient.Reset();
- m_rtBox.Reset();
- m_rtCaption.Reset();
- m_rtFocus.Reset();
+ : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr) {
+ m_TTOStyles.single_line_ = true;
}
CFWL_CheckBox::~CFWL_CheckBox() {}
@@ -98,7 +91,7 @@
textParam.m_matrix.Concat(matrix);
textParam.m_rtPart = m_rtCaption;
textParam.m_wsText = L"Check box";
- textParam.m_dwTTOStyles = m_dwTTOStyles;
+ textParam.m_dwTTOStyles = m_TTOStyles;
textParam.m_iTTOAlign = m_iTTOAlign;
pTheme->DrawText(&textParam);
}
@@ -135,8 +128,8 @@
CFX_RectF rtFocus(m_rtCaption.left, m_rtCaption.top, m_rtCaption.width,
m_rtCaption.height);
- CalcTextRect(L"Check box", m_pProperties->m_pThemeProvider.Get(),
- m_dwTTOStyles, m_iTTOAlign, &rtFocus);
+ CalcTextRect(L"Check box", m_pProperties->m_pThemeProvider.Get(), m_TTOStyles,
+ m_iTTOAlign, &rtFocus);
m_rtFocus = CFX_RectF(m_rtCaption.TopLeft(),
std::max(m_rtCaption.width, rtFocus.width),
@@ -168,9 +161,8 @@
void CFWL_CheckBox::UpdateTextOutStyles() {
m_iTTOAlign = FDE_TextAlignment::kTopLeft;
-
- m_dwTTOStyles.Reset();
- m_dwTTOStyles.single_line_ = true;
+ m_TTOStyles.Reset();
+ m_TTOStyles.single_line_ = true;
}
void CFWL_CheckBox::NextStates() {
diff --git a/xfa/fwl/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h
index fdee516..0fa0236 100644
--- a/xfa/fwl/cfwl_checkbox.h
+++ b/xfa/fwl/cfwl_checkbox.h
@@ -64,10 +64,10 @@
CFX_RectF m_rtBox;
CFX_RectF m_rtCaption;
CFX_RectF m_rtFocus;
- FDE_TextStyle m_dwTTOStyles;
- FDE_TextAlignment m_iTTOAlign;
- bool m_bBtnDown;
- float m_fBoxHeight;
+ FDE_TextStyle m_TTOStyles;
+ FDE_TextAlignment m_iTTOAlign = FDE_TextAlignment::kCenter;
+ bool m_bBtnDown = false;
+ float m_fBoxHeight = 16.0f;
};
#endif // XFA_FWL_CFWL_CHECKBOX_H_
diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index c3e327c..51727f1 100644
--- a/xfa/fwl/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -403,8 +403,7 @@
m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
} else {
m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
- m_rtBtn.Reset();
-
+ m_rtBtn = CFX_RectF();
if (IsMonthCalendarVisible())
ShowMonthCalendar(false);
if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 14f3b0e..0c28a18 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -47,20 +47,7 @@
CFWL_Edit::CFWL_Edit(const CFWL_App* app,
std::unique_ptr<CFWL_WidgetProperties> properties,
CFWL_Widget* pOuter)
- : CFWL_Widget(app, std::move(properties), pOuter),
- m_fVAlignOffset(0.0f),
- m_fScrollOffsetX(0.0f),
- m_fScrollOffsetY(0.0f),
- m_bLButtonDown(false),
- m_CursorPosition(0),
- m_nLimit(-1),
- m_fFontSize(0),
- m_bSetRange(false),
- m_iMax(0xFFFFFFF) {
- m_rtClient.Reset();
- m_rtEngine.Reset();
- m_rtStatic.Reset();
-
+ : CFWL_Widget(app, std::move(properties), pOuter) {
m_EdtEngine.SetDelegate(this);
}
diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h
index 64dec98..e633568 100644
--- a/xfa/fwl/cfwl_edit.h
+++ b/xfa/fwl/cfwl_edit.h
@@ -154,16 +154,16 @@
CFX_RectF m_rtEngine;
CFX_RectF m_rtStatic;
CFX_RectF m_rtCaret;
- float m_fVAlignOffset;
- float m_fScrollOffsetX;
- float m_fScrollOffsetY;
+ bool m_bLButtonDown = false;
+ bool m_bSetRange = false;
+ int32_t m_nLimit = -1;
+ int32_t m_iMax = 0xFFFFFFF;
+ float m_fVAlignOffset = 0.0f;
+ float m_fScrollOffsetX = 0.0f;
+ float m_fScrollOffsetY = 0.0f;
+ float m_fFontSize = 0.0f;
+ size_t m_CursorPosition = 0;
CFDE_TextEditEngine m_EdtEngine;
- bool m_bLButtonDown;
- size_t m_CursorPosition;
- int32_t m_nLimit;
- float m_fFontSize;
- bool m_bSetRange;
- int32_t m_iMax;
std::unique_ptr<CFWL_ScrollBar> m_pVertScrollBar;
std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
std::unique_ptr<CFWL_Caret> m_pCaret;
diff --git a/xfa/fwl/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp
index e1fec82..73ef1b8 100644
--- a/xfa/fwl/cfwl_form.cpp
+++ b/xfa/fwl/cfwl_form.cpp
@@ -24,13 +24,7 @@
CFWL_Form::CFWL_Form(const CFWL_App* app,
std::unique_ptr<CFWL_WidgetProperties> properties,
CFWL_Widget* pOuter)
- : CFWL_Widget(app, std::move(properties), pOuter),
- m_pSubFocus(nullptr),
- m_fCXBorder(0),
- m_fCYBorder(0) {
- m_rtRelative.Reset();
- m_rtRestore.Reset();
-
+ : CFWL_Widget(app, std::move(properties), pOuter) {
RegisterForm();
RegisterEventTarget(nullptr);
}
diff --git a/xfa/fwl/cfwl_form.h b/xfa/fwl/cfwl_form.h
index 8f10c8b..d16964f 100644
--- a/xfa/fwl/cfwl_form.h
+++ b/xfa/fwl/cfwl_form.h
@@ -55,9 +55,9 @@
CFX_RectF m_rtRestore;
CFX_RectF m_rtRelative;
std::unique_ptr<CFWL_NoteLoop> m_pNoteLoop;
- CFWL_Widget* m_pSubFocus;
- float m_fCXBorder;
- float m_fCYBorder;
+ CFWL_Widget* m_pSubFocus = nullptr;
+ float m_fCXBorder = 0.0f;
+ float m_fCYBorder = 0.0f;
};
#endif // XFA_FWL_CFWL_FORM_H_
diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index 68dfec6..5ef5682 100644
--- a/xfa/fwl/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -31,16 +31,7 @@
CFWL_ListBox::CFWL_ListBox(const CFWL_App* app,
std::unique_ptr<CFWL_WidgetProperties> properties,
CFWL_Widget* pOuter)
- : CFWL_Widget(app, std::move(properties), pOuter),
- m_iTTOAligns(FDE_TextAlignment::kTopLeft),
- m_hAnchor(nullptr),
- m_fScorllBarWidth(0),
- m_bLButtonDown(false),
- m_pScrollBarTP(nullptr) {
- m_rtClient.Reset();
- m_rtConent.Reset();
- m_rtStatic.Reset();
-}
+ : CFWL_Widget(app, std::move(properties), pOuter) {}
CFWL_ListBox::~CFWL_ListBox() {}
@@ -69,7 +60,7 @@
break;
}
}
- m_dwTTOStyles.single_line_ = true;
+ m_TTOStyles.single_line_ = true;
m_fScorllBarWidth = GetScrollWidth();
CalcSize(false);
}
@@ -460,7 +451,7 @@
textParam.m_matrix.Concat(*pMatrix);
textParam.m_rtPart = rtText;
textParam.m_wsText = std::move(wsText);
- textParam.m_dwTTOStyles = m_dwTTOStyles;
+ textParam.m_dwTTOStyles = m_TTOStyles;
textParam.m_iTTOAlign = m_iTTOAligns;
textParam.m_bMaximize = true;
pTheme->DrawText(&textParam);
diff --git a/xfa/fwl/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h
index 6b0c012..9d3a21a 100644
--- a/xfa/fwl/cfwl_listbox.h
+++ b/xfa/fwl/cfwl_listbox.h
@@ -122,13 +122,13 @@
CFX_RectF m_rtConent;
std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
std::unique_ptr<CFWL_ScrollBar> m_pVertScrollBar;
- FDE_TextStyle m_dwTTOStyles;
- FDE_TextAlignment m_iTTOAligns;
- CFWL_ListItem* m_hAnchor;
- float m_fItemHeight;
- float m_fScorllBarWidth;
- bool m_bLButtonDown;
- IFWL_ThemeProvider* m_pScrollBarTP;
+ FDE_TextStyle m_TTOStyles;
+ FDE_TextAlignment m_iTTOAligns = FDE_TextAlignment::kTopLeft;
+ bool m_bLButtonDown = false;
+ float m_fItemHeight = 0.0f;
+ float m_fScorllBarWidth = 0.0f;
+ CFWL_ListItem* m_hAnchor = nullptr;
+ IFWL_ThemeProvider* m_pScrollBarTP = nullptr;
std::vector<std::unique_ptr<CFWL_ListItem>> m_ItemArray;
};
diff --git a/xfa/fwl/cfwl_listitem.cpp b/xfa/fwl/cfwl_listitem.cpp
index f8a7b75..edf1be3 100644
--- a/xfa/fwl/cfwl_listitem.cpp
+++ b/xfa/fwl/cfwl_listitem.cpp
@@ -6,9 +6,6 @@
#include "xfa/fwl/cfwl_listitem.h"
-CFWL_ListItem::CFWL_ListItem(const WideString& text)
- : m_dwStates(0), m_wsText(text) {
- m_rtItem.Reset();
-}
+CFWL_ListItem::CFWL_ListItem(const WideString& text) : m_wsText(text) {}
CFWL_ListItem::~CFWL_ListItem() {}
diff --git a/xfa/fwl/cfwl_listitem.h b/xfa/fwl/cfwl_listitem.h
index 62c3a98..a6afb22 100644
--- a/xfa/fwl/cfwl_listitem.h
+++ b/xfa/fwl/cfwl_listitem.h
@@ -24,8 +24,8 @@
WideString GetText() const { return m_wsText; }
private:
+ uint32_t m_dwStates = 0;
CFX_RectF m_rtItem;
- uint32_t m_dwStates;
WideString m_wsText;
};
diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index e4fe3c4..9a762a5 100644
--- a/xfa/fwl/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -32,30 +32,7 @@
std::unique_ptr<CFWL_WidgetProperties> properties,
CFWL_Widget* pOuter)
: CFWL_Widget(app, std::move(properties), pOuter),
- m_pTimerInfo(nullptr),
- m_fRangeMin(0),
- m_fRangeMax(-1),
- m_fPageSize(0),
- m_fStepSize(0),
- m_fPos(0),
- m_fTrackPos(0),
- m_iMinButtonState(CFWL_PartState_Normal),
- m_iMaxButtonState(CFWL_PartState_Normal),
- m_iThumbButtonState(CFWL_PartState_Normal),
- m_iMinTrackState(CFWL_PartState_Normal),
- m_iMaxTrackState(CFWL_PartState_Normal),
- m_fLastTrackPos(0),
- m_iMouseWheel(0),
- m_bMouseDown(false),
- m_fButtonLen(0),
- m_bMinSize(false),
m_Timer(this) {
- m_rtClient.Reset();
- m_rtThumb.Reset();
- m_rtMinBtn.Reset();
- m_rtMaxBtn.Reset();
- m_rtMinTrack.Reset();
- m_rtMaxTrack.Reset();
}
CFWL_ScrollBar::~CFWL_ScrollBar() {}
diff --git a/xfa/fwl/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h
index fc5248f..c3df6bb 100644
--- a/xfa/fwl/cfwl_scrollbar.h
+++ b/xfa/fwl/cfwl_scrollbar.h
@@ -111,23 +111,23 @@
void DoMouseHover(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
UnownedPtr<CFWL_TimerInfo> m_pTimerInfo;
- float m_fRangeMin;
- float m_fRangeMax;
- float m_fPageSize;
- float m_fStepSize;
- float m_fPos;
- float m_fTrackPos;
- int32_t m_iMinButtonState;
- int32_t m_iMaxButtonState;
- int32_t m_iThumbButtonState;
- int32_t m_iMinTrackState;
- int32_t m_iMaxTrackState;
- float m_fLastTrackPos;
+ float m_fRangeMin = 0.0f;
+ float m_fRangeMax = -1.0f;
+ float m_fPageSize = 0.0f;
+ float m_fStepSize = 0.0f;
+ float m_fPos = 0.0f;
+ float m_fTrackPos = 0.0f;
+ int32_t m_iMinButtonState = CFWL_PartState_Normal;
+ int32_t m_iMaxButtonState = CFWL_PartState_Normal;
+ int32_t m_iThumbButtonState = CFWL_PartState_Normal;
+ int32_t m_iMinTrackState = CFWL_PartState_Normal;
+ int32_t m_iMaxTrackState = CFWL_PartState_Normal;
+ float m_fLastTrackPos = 0.0f;
CFX_PointF m_cpTrackPoint;
- int32_t m_iMouseWheel;
- bool m_bMouseDown;
- float m_fButtonLen;
- bool m_bMinSize;
+ int32_t m_iMouseWheel = 0;
+ float m_fButtonLen = 0.0f;
+ bool m_bMouseDown = false;
+ bool m_bMinSize = false;
CFX_RectF m_rtClient;
CFX_RectF m_rtThumb;
CFX_RectF m_rtMinBtn;
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index beb9ee4..dfd8a69 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -191,10 +191,9 @@
CXFA_Caption* caption = m_pNode->GetCaptionIfExists();
if (caption && !caption->IsHidden()) {
iCapPlacement = caption->GetPlacementType();
- if (iCapPlacement == XFA_AttributeValue::Top && GetPrev()) {
- m_rtCaption.Reset();
- } else if (iCapPlacement == XFA_AttributeValue::Bottom && GetNext()) {
- m_rtCaption.Reset();
+ if ((iCapPlacement == XFA_AttributeValue::Top && GetPrev()) ||
+ (iCapPlacement == XFA_AttributeValue::Bottom && GetNext())) {
+ m_rtCaption = CFX_RectF();
} else {
fCapReserve = caption->GetReserve();
if (iCapPlacement == XFA_AttributeValue::Top ||
diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp
index 7db4ed4..820b294 100644
--- a/xfa/fxfa/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/cxfa_fwltheme.cpp
@@ -58,9 +58,7 @@
m_pCaretTP(pdfium::MakeUnique<CFWL_CaretTP>()),
m_pBarcodeTP(pdfium::MakeUnique<CFWL_BarcodeTP>()),
m_pTextOut(pdfium::MakeUnique<CFDE_TextOut>()),
- m_pCalendarFont(nullptr),
m_pApp(pApp) {
- m_Rect.Reset();
}
bool CXFA_FWLTheme::LoadCalendarFont(CXFA_FFDoc* doc) {
