diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-10-25 23:25:58 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-25 23:25:58 +0000 |
| commit | 6fe32f898af3eea875fd01a6d18f719d17dd72f3 (patch) | |
| tree | f63a1a03d3fffc3e4e765442df9805b526660765 /fpdfsdk/pwl/cpwl_caret.h | |
| parent | ed7da31f67e93c8923669ad496126aa005a8d3a2 (diff) | |
| download | pdfium-6fe32f898af3eea875fd01a6d18f719d17dd72f3.tar.xz | |
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>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_caret.h')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_caret.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fpdfsdk/pwl/cpwl_caret.h b/fpdfsdk/pwl/cpwl_caret.h index 27418ec868..c85a8776f3 100644 --- a/fpdfsdk/pwl/cpwl_caret.h +++ b/fpdfsdk/pwl/cpwl_caret.h @@ -7,11 +7,13 @@ #ifndef FPDFSDK_PWL_CPWL_CARET_H_ #define FPDFSDK_PWL_CPWL_CARET_H_ +#include <memory> + #include "fpdfsdk/pwl/cpwl_wnd.h" class CPWL_Caret final : public CPWL_Wnd { public: - CPWL_Caret(); + explicit CPWL_Caret(std::unique_ptr<PrivateData> pAttachedData); ~CPWL_Caret() override; // CPWL_Wnd @@ -29,11 +31,11 @@ class CPWL_Caret final : public CPWL_Wnd { private: CFX_FloatRect GetCaretRect() const; - bool m_bFlash; + bool m_bFlash = false; CFX_PointF m_ptHead; CFX_PointF m_ptFoot; - float m_fWidth; - int32_t m_nDelay; + float m_fWidth = 0.4f; + int32_t m_nDelay = 0; CFX_FloatRect m_rcInvalid; }; |