Make CPWL_Wnd own its pAttachedData.

This requires moving it out of CreateParams, since that must be
a copyable struct, and implies that currently there is some
questionable sharing going on. To resolve this, introduce a
Clone() method so that each window gets its own copy.

Make GetAttachedData() return a const pointer, so that callers
can't free it behind our back.

Tidy initializations along the way.

Change-Id: Iadc97688b4692bf4fafefe8cff88af88672f7110
Reviewed-on: https://pdfium-review.googlesource.com/c/44590
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 11 insertions, 22 deletions

diff --git a/fpdfsdk/pwl/cpwl_special_button.cpp b/fpdfsdk/pwl/cpwl_special_button.cpp
index 061d024382..8e5f1b8d48 100644
--- a/fpdfsdk/pwl/cpwl_special_button.cpp
+++ b/fpdfsdk/pwl/cpwl_special_button.cpp
@@ -6,29 +6,25 @@
 
 #include "fpdfsdk/pwl/cpwl_special_button.h"
 
+#include <utility>
+
 #include "fpdfsdk/pwl/cpwl_button.h"
 #include "fpdfsdk/pwl/cpwl_wnd.h"
 
-CPWL_PushButton::CPWL_PushButton() {}
+CPWL_PushButton::CPWL_PushButton(std::unique_ptr<PrivateData> pAttachedData)
+    : CPWL_Button(std::move(pAttachedData)) {}
 
-CPWL_PushButton::~CPWL_PushButton() {}
+CPWL_PushButton::~CPWL_PushButton() = default;
 
 CFX_FloatRect CPWL_PushButton::GetFocusRect() const {
   return GetWindowRect().GetDeflated(static_cast<float>(GetBorderWidth()),
                                      static_cast<float>(GetBorderWidth()));
 }
 
-CPWL_CheckBox::CPWL_CheckBox() : m_bChecked(false) {}
-
-CPWL_CheckBox::~CPWL_CheckBox() {}
+CPWL_CheckBox::CPWL_CheckBox(std::unique_ptr<PrivateData> pAttachedData)
+    : CPWL_Button(std::move(pAttachedData)) {}
 
-void CPWL_CheckBox::SetCheck(bool bCheck) {
-  m_bChecked = bCheck;
-}
-
-bool CPWL_CheckBox::IsChecked() const {
-  return m_bChecked;
-}
+CPWL_CheckBox::~CPWL_CheckBox() = default;
 
 bool CPWL_CheckBox::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
   if (IsReadOnly())
@@ -43,9 +39,10 @@ bool CPWL_CheckBox::OnChar(uint16_t nChar, uint32_t nFlag) {
   return true;
 }
 
-CPWL_RadioButton::CPWL_RadioButton() : m_bChecked(false) {}
+CPWL_RadioButton::CPWL_RadioButton(std::unique_ptr<PrivateData> pAttachedData)
+    : CPWL_Button(std::move(pAttachedData)) {}
 
-CPWL_RadioButton::~CPWL_RadioButton() {}
+CPWL_RadioButton::~CPWL_RadioButton() = default;
 
 bool CPWL_RadioButton::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
   if (IsReadOnly())
@@ -55,14 +52,6 @@ bool CPWL_RadioButton::OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) {
   return true;
 }
 
-void CPWL_RadioButton::SetCheck(bool bCheck) {
-  m_bChecked = bCheck;
-}
-
-bool CPWL_RadioButton::IsChecked() const {
-  return m_bChecked;
-}
-
 bool CPWL_RadioButton::OnChar(uint16_t nChar, uint32_t nFlag) {
   SetCheck(true);
   return true;