From 6f960347f8474a202d8dd99063bf8ce584896baf Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 19 Sep 2017 13:46:08 -0400 Subject: Setting focus on a widget may destroy the widget When a widget has focus set, this can trigger an Invalidation call which can trigger a page and annotation reload. This reload can destroy the current widget we're handling. This CL adds ObservedPtrs as needed so we can make sure the widgets are still alive after we've done the Invalidation. Bug: chromium:765921 Change-Id: I51cd24aa1ebd96abe9478efef5130a4e568dac1a Reviewed-on: https://pdfium-review.googlesource.com/14290 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/pwl/cpwl_caret.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'fpdfsdk/pwl/cpwl_caret.cpp') diff --git a/fpdfsdk/pwl/cpwl_caret.cpp b/fpdfsdk/pwl/cpwl_caret.cpp index b1040bc2e3..99d2e2ece7 100644 --- a/fpdfsdk/pwl/cpwl_caret.cpp +++ b/fpdfsdk/pwl/cpwl_caret.cpp @@ -59,6 +59,8 @@ void CPWL_Caret::TimerProc() { } else { m_bFlash = !m_bFlash; InvalidateRect(nullptr); + // Note, |this| may no longer be viable at this point. If more work needs + // to be done, add an observer. } } @@ -77,15 +79,24 @@ void CPWL_Caret::SetCaret(bool bVisible, m_ptFoot = ptFoot; m_bFlash = true; Move(m_rcInvalid, false, true); + // Note, |this| may no longer be viable at this point. If more work + // needs to be done, add an observer. } } else { m_ptHead = ptHead; m_ptFoot = ptFoot; EndTimer(); BeginTimer(PWL_CARET_FLASHINTERVAL); + + ObservedPtr observer(this); CPWL_Wnd::SetVisible(true); + if (!observer) + return; + m_bFlash = true; Move(m_rcInvalid, false, true); + // Note, |this| may no longer be viable at this point. If more work needs + // to be done, add an observer. } } else { m_ptHead = CFX_PointF(); @@ -94,6 +105,8 @@ void CPWL_Caret::SetCaret(bool bVisible, if (IsVisible()) { EndTimer(); CPWL_Wnd::SetVisible(false); + // Note, |this| may no longer be viable at this point. If more work needs + // to be done, add an observer. } } } @@ -111,4 +124,6 @@ void CPWL_Caret::InvalidateRect(CFX_FloatRect* pRect) { } else { CPWL_Wnd::InvalidateRect(pRect); } + // Note, |this| may no longer be viable at this point. If more work needs + // to be done, add an observer. } -- cgit v1.2.3