diff options
| author | tsepez <tsepez@chromium.org> | 2016-09-27 14:29:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-27 14:29:57 -0700 |
| commit | f8074cefb2f8d947fa83d151bcbe080b485d6e6b (patch) | |
| tree | fe97655234318181a58827666576010abb745b18 /fpdfsdk/fpdfxfa | |
| parent | ec7a9455c15b2cebb75a6036c8636beb601e543a (diff) | |
| download | pdfium-f8074cefb2f8d947fa83d151bcbe080b485d6e6b.tar.xz | |
Watch destruction of widgets around OnAAction() method.
We implemented the CFX_Observable mechanism for detecting
stale objects some time ago; now just use it in more places.
Change method signatures to required an ObservedPtr to
indicate that the callers are aware that the value may be
destroyed out from underneath them.
BUG=649659
Review-Url: https://codereview.chromium.org/2368403002
Diffstat (limited to 'fpdfsdk/fpdfxfa')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 106d997e44..a44172e191 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -538,7 +538,8 @@ void CPDFXFA_DocEnvironment::SetFocusWidget(CXFA_FFDoc* hDoc, return; if (!hWidget) { - m_pDocument->GetSDKDoc()->SetFocusAnnot(nullptr); + CPDFSDK_Annot::ObservedPtr pNull; + m_pDocument->GetSDKDoc()->SetFocusAnnot(&pNull); return; } @@ -548,9 +549,9 @@ void CPDFXFA_DocEnvironment::SetFocusWidget(CXFA_FFDoc* hDoc, if (!pPageView) continue; - CPDFSDK_Annot* pAnnot = pPageView->GetAnnotByXFAWidget(hWidget); + CPDFSDK_Annot::ObservedPtr pAnnot(pPageView->GetAnnotByXFAWidget(hWidget)); if (pAnnot) { - m_pDocument->GetSDKDoc()->SetFocusAnnot(pAnnot); + m_pDocument->GetSDKDoc()->SetFocusAnnot(&pAnnot); break; } } |