Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

Issue 2368403002: Watch destruction of widgets around OnAAction() method (Closed)
Patch Set: blown merge Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « fpdfsdk/formfiller/cffl_radiobutton.cpp ('k') | fpdfsdk/include/cpdfsdk_annothandlermgr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 106d997e440493c95147a8a2385398256750c13b..a44172e191f51e1c6208d6ad04b037e878e0b001 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;
}
}
« no previous file with comments | « fpdfsdk/formfiller/cffl_radiobutton.cpp ('k') | fpdfsdk/include/cpdfsdk_annothandlermgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698