Remove CFWL_Message source. CFWL_Message::GetSrcTarget() has no callers. Change-Id: I8bf104f0a92c13d2ca08ed09b6f70bbe0c0ba778 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/86631 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index 048008e..c0f26f8 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp
@@ -474,7 +474,7 @@ void CFWL_ComboBox::OnFocusGained() { m_Properties.m_dwStates |= FWL_STATE_WGT_Focused; if ((m_pEdit->GetStates() & FWL_STATE_WGT_Focused) == 0) { - CFWL_MessageSetFocus msg(nullptr, m_pEdit); + CFWL_MessageSetFocus msg(m_pEdit); m_pEdit->GetDelegate()->OnProcessMessage(&msg); } } @@ -482,7 +482,7 @@ void CFWL_ComboBox::OnFocusLost() { m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused; HideDropDownList(); - CFWL_MessageKillFocus msg(m_pEdit, nullptr); + CFWL_MessageKillFocus msg(nullptr); m_pEdit->GetDelegate()->OnProcessMessage(&msg); }
diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp index 085df3c..28129ad 100644 --- a/xfa/fwl/cfwl_datetimepicker.cpp +++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -216,7 +216,7 @@ m_pMonthCal->Update(); m_pMonthCal->RemoveStates(FWL_STATE_WGT_Invisible); - CFWL_MessageSetFocus msg(m_pEdit, m_pMonthCal); + CFWL_MessageSetFocus msg(m_pMonthCal); m_pEdit->GetDelegate()->OnProcessMessage(&msg); RepaintInflatedMonthCalRect(); } @@ -368,10 +368,8 @@ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused; m_BtnRect = CFX_RectF(); HideMonthCalendar(); - if (m_pEdit->GetStates() & FWL_STATE_WGT_Focused) { - pMsg->SetSrcTarget(m_pEdit); + if (m_pEdit->GetStates() & FWL_STATE_WGT_Focused) m_pEdit->GetDelegate()->OnProcessMessage(pMsg); - } rtInvalidate.Inflate(2, 2); RepaintRect(rtInvalidate); }
diff --git a/xfa/fwl/cfwl_message.cpp b/xfa/fwl/cfwl_message.cpp index f330a08..18df6ad 100644 --- a/xfa/fwl/cfwl_message.cpp +++ b/xfa/fwl/cfwl_message.cpp
@@ -6,9 +6,7 @@ #include "xfa/fwl/cfwl_message.h" -CFWL_Message::CFWL_Message(Type type, - CFWL_Widget* pSrcTarget, - CFWL_Widget* pDstTarget) - : m_type(type), m_pSrcTarget(pSrcTarget), m_pDstTarget(pDstTarget) {} +CFWL_Message::CFWL_Message(Type type, CFWL_Widget* pDstTarget) + : m_type(type), m_pDstTarget(pDstTarget) {} CFWL_Message::~CFWL_Message() = default;
diff --git a/xfa/fwl/cfwl_message.h b/xfa/fwl/cfwl_message.h index 4e36a4a..9c8c7b9 100644 --- a/xfa/fwl/cfwl_message.h +++ b/xfa/fwl/cfwl_message.h
@@ -22,19 +22,16 @@ virtual ~CFWL_Message(); Type GetType() const { return m_type; } - CFWL_Widget* GetSrcTarget() const { return m_pSrcTarget; } CFWL_Widget* GetDstTarget() const { return m_pDstTarget; } - void SetSrcTarget(CFWL_Widget* pWidget) { m_pSrcTarget = pWidget; } void SetDstTarget(CFWL_Widget* pWidget) { m_pDstTarget = pWidget; } protected: - CFWL_Message(Type type, CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget); + CFWL_Message(Type type, CFWL_Widget* pDstTarget); CFWL_Message(const CFWL_Message& that) = delete; CFWL_Message& operator=(const CFWL_Message& that) = delete; private: const Type m_type; - UnownedPtr<CFWL_Widget> m_pSrcTarget; UnownedPtr<CFWL_Widget> m_pDstTarget; };
diff --git a/xfa/fwl/cfwl_messagekey.cpp b/xfa/fwl/cfwl_messagekey.cpp index b9f91a1..ad33196 100644 --- a/xfa/fwl/cfwl_messagekey.cpp +++ b/xfa/fwl/cfwl_messagekey.cpp
@@ -10,7 +10,7 @@ KeyCommand cmd, Mask<XFA_FWL_KeyFlag> flags, uint32_t dwKeyCodeOrChar) - : CFWL_Message(CFWL_Message::Type::kKey, nullptr, pDstTarget), + : CFWL_Message(CFWL_Message::Type::kKey, pDstTarget), m_dwCmd(cmd), m_dwFlags(flags), m_dwKeyCodeOrChar(dwKeyCodeOrChar) {}
diff --git a/xfa/fwl/cfwl_messagekillfocus.cpp b/xfa/fwl/cfwl_messagekillfocus.cpp index cbe0f5e..837fda8 100644 --- a/xfa/fwl/cfwl_messagekillfocus.cpp +++ b/xfa/fwl/cfwl_messagekillfocus.cpp
@@ -6,8 +6,7 @@ #include "xfa/fwl/cfwl_messagekillfocus.h" -CFWL_MessageKillFocus::CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget, - CFWL_Widget* pDstTarget) - : CFWL_Message(CFWL_Message::Type::kKillFocus, pSrcTarget, pDstTarget) {} +CFWL_MessageKillFocus::CFWL_MessageKillFocus(CFWL_Widget* pDstTarget) + : CFWL_Message(CFWL_Message::Type::kKillFocus, pDstTarget) {} CFWL_MessageKillFocus::~CFWL_MessageKillFocus() = default;
diff --git a/xfa/fwl/cfwl_messagekillfocus.h b/xfa/fwl/cfwl_messagekillfocus.h index 26fd04f..76c5afe 100644 --- a/xfa/fwl/cfwl_messagekillfocus.h +++ b/xfa/fwl/cfwl_messagekillfocus.h
@@ -12,7 +12,7 @@ class CFWL_MessageKillFocus final : public CFWL_Message { public: - CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget); + explicit CFWL_MessageKillFocus(CFWL_Widget* pDstTarget); ~CFWL_MessageKillFocus() override; bool IsFocusedOnWidget(const CFWL_Widget* pWidget) const {
diff --git a/xfa/fwl/cfwl_messagemouse.cpp b/xfa/fwl/cfwl_messagemouse.cpp index 4e11411..1729a1b 100644 --- a/xfa/fwl/cfwl_messagemouse.cpp +++ b/xfa/fwl/cfwl_messagemouse.cpp
@@ -10,7 +10,7 @@ MouseCommand cmd, Mask<XFA_FWL_KeyFlag> flags, CFX_PointF pos) - : CFWL_Message(CFWL_Message::Type::kMouse, nullptr, pDstTarget), + : CFWL_Message(CFWL_Message::Type::kMouse, pDstTarget), m_dwCmd(cmd), m_dwFlags(flags), m_pos(pos) {}
diff --git a/xfa/fwl/cfwl_messagemousewheel.cpp b/xfa/fwl/cfwl_messagemousewheel.cpp index bd62398..e02726f 100644 --- a/xfa/fwl/cfwl_messagemousewheel.cpp +++ b/xfa/fwl/cfwl_messagemousewheel.cpp
@@ -9,7 +9,7 @@ CFWL_MessageMouseWheel::CFWL_MessageMouseWheel(CFWL_Widget* destination, const CFX_PointF& pos, const CFX_Vector& delta) - : CFWL_Message(CFWL_Message::Type::kMouseWheel, nullptr, destination), + : CFWL_Message(CFWL_Message::Type::kMouseWheel, destination), pos_(pos), delta_(delta) {}
diff --git a/xfa/fwl/cfwl_messagesetfocus.cpp b/xfa/fwl/cfwl_messagesetfocus.cpp index 14e066e..d07a672 100644 --- a/xfa/fwl/cfwl_messagesetfocus.cpp +++ b/xfa/fwl/cfwl_messagesetfocus.cpp
@@ -6,8 +6,7 @@ #include "xfa/fwl/cfwl_messagesetfocus.h" -CFWL_MessageSetFocus::CFWL_MessageSetFocus(CFWL_Widget* pSrcTarget, - CFWL_Widget* pDstTarget) - : CFWL_Message(CFWL_Message::Type::kSetFocus, pSrcTarget, pDstTarget) {} +CFWL_MessageSetFocus::CFWL_MessageSetFocus(CFWL_Widget* pDstTarget) + : CFWL_Message(CFWL_Message::Type::kSetFocus, pDstTarget) {} CFWL_MessageSetFocus::~CFWL_MessageSetFocus() = default;
diff --git a/xfa/fwl/cfwl_messagesetfocus.h b/xfa/fwl/cfwl_messagesetfocus.h index 0102994..b2092ff 100644 --- a/xfa/fwl/cfwl_messagesetfocus.h +++ b/xfa/fwl/cfwl_messagesetfocus.h
@@ -11,7 +11,7 @@ class CFWL_MessageSetFocus final : public CFWL_Message { public: - CFWL_MessageSetFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget); + explicit CFWL_MessageSetFocus(CFWL_Widget* pDstTarget); ~CFWL_MessageSetFocus() override; };
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 1c167fa..7196e85 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -515,7 +515,7 @@ if (!GetNormalWidget()) return false; - CFWL_MessageSetFocus msg(nullptr, GetNormalWidget()); + CFWL_MessageSetFocus msg(GetNormalWidget()); SendMessageToFWLWidget(&msg); GetLayoutItem()->SetStatusBits(XFA_WidgetStatus::kFocused); InvalidateRect(); @@ -525,7 +525,7 @@ bool CXFA_FFField::OnKillFocus(CXFA_FFWidget* pNewWidget) { if (GetNormalWidget()) { - CFWL_MessageKillFocus msg(nullptr, GetNormalWidget()); + CFWL_MessageKillFocus msg(GetNormalWidget()); SendMessageToFWLWidget(&msg); GetLayoutItem()->ClearStatusBits(XFA_WidgetStatus::kFocused); InvalidateRect();
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp index 6bf2503..dd5583a 100644 --- a/xfa/fxfa/cxfa_fftextedit.cpp +++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -179,13 +179,13 @@ if (!CXFA_FFWidget::OnSetFocus(pOldWidget)) return false; - CFWL_MessageSetFocus msg(nullptr, GetNormalWidget()); + CFWL_MessageSetFocus msg(GetNormalWidget()); SendMessageToFWLWidget(&msg); return true; } bool CXFA_FFTextEdit::OnKillFocus(CXFA_FFWidget* pNewWidget) { - CFWL_MessageKillFocus msg(nullptr, GetNormalWidget()); + CFWL_MessageKillFocus msg(GetNormalWidget()); SendMessageToFWLWidget(&msg); GetLayoutItem()->ClearStatusBits(XFA_WidgetStatus::kFocused);