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, 13 insertions, 11 deletions

diff --git a/fpdfsdk/pwl/cpwl_special_button.h b/fpdfsdk/pwl/cpwl_special_button.h
index 606be78f31..28c2a6b14c 100644
--- a/fpdfsdk/pwl/cpwl_special_button.h
+++ b/fpdfsdk/pwl/cpwl_special_button.h
@@ -7,47 +7,49 @@
 #ifndef FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
 #define FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
 
+#include <memory>
+
 #include "fpdfsdk/pwl/cpwl_button.h"
 
 class CPWL_PushButton final : public CPWL_Button {
  public:
-  CPWL_PushButton();
+  explicit CPWL_PushButton(std::unique_ptr<PrivateData> pAttachedData);
   ~CPWL_PushButton() override;
 
-  // CPWL_Button
+  // CPWL_Button:
   CFX_FloatRect GetFocusRect() const override;
 };
 
 class CPWL_CheckBox final : public CPWL_Button {
  public:
-  CPWL_CheckBox();
+  explicit CPWL_CheckBox(std::unique_ptr<PrivateData> pAttachedData);
   ~CPWL_CheckBox() override;
 
-  // CPWL_Button
+  // CPWL_Button:
   bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
   bool OnChar(uint16_t nChar, uint32_t nFlag) override;
 
-  void SetCheck(bool bCheck);
-  bool IsChecked() const;
+  bool IsChecked() const { return m_bChecked; }
+  void SetCheck(bool bCheck) { m_bChecked = bCheck; }
 
  private:
-  bool m_bChecked;
+  bool m_bChecked = false;
 };
 
 class CPWL_RadioButton final : public CPWL_Button {
  public:
-  CPWL_RadioButton();
+  explicit CPWL_RadioButton(std::unique_ptr<PrivateData> pAttachedData);
   ~CPWL_RadioButton() override;
 
   // CPWL_Button
   bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override;
   bool OnChar(uint16_t nChar, uint32_t nFlag) override;
 
-  void SetCheck(bool bCheck);
-  bool IsChecked() const;
+  bool IsChecked() const { return m_bChecked; }
+  void SetCheck(bool bCheck) { m_bChecked = bCheck; }
 
  private:
-  bool m_bChecked;
+  bool m_bChecked = false;
 };
 
 #endif  // FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_