diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-11 09:32:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-11 09:32:33 -0800 |
| commit | 8fa82794ffc2763e9fa1fc9d401c8e9a14d7c67f (patch) | |
| tree | 724f69ba295176752df1040e4fb770f69c8dda93 /fpdfsdk/cpdfsdk_interform.h | |
| parent | 76a44dea318041f8229d80e70ca3568a435611eb (diff) | |
| download | pdfium-8fa82794ffc2763e9fa1fc9d401c8e9a14d7c67f.tar.xz | |
Annotation deleted while retrieving it in JS
Widgets as returned from GetWidgets() can pop out of existence
unexpectedly, so always return observed pointers. This extends
the same pattern used elsewhere in the file to all occurrences.
BUG=679642
Review-Url: https://codereview.chromium.org/2624933002
Diffstat (limited to 'fpdfsdk/cpdfsdk_interform.h')
| -rw-r--r-- | fpdfsdk/cpdfsdk_interform.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h index 9f35d560e6..032399c84e 100644 --- a/fpdfsdk/cpdfsdk_interform.h +++ b/fpdfsdk/cpdfsdk_interform.h @@ -15,6 +15,7 @@ #include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/fx_basic.h" #include "core/fxge/fx_dib.h" +#include "fpdfsdk/cpdfsdk_widget.h" class CPDF_Dictionary; class CPDF_FormControl; @@ -22,7 +23,6 @@ class CPDF_FormField; class CPDF_InterForm; class CPDF_Object; class CPDFSDK_FormFillEnvironment; -class CPDFSDK_Widget; #ifdef PDF_ENABLE_XFA class CPDFSDK_XFAWidget; @@ -42,9 +42,9 @@ class CPDFSDK_InterForm : public IPDF_FormNotify { CPDFSDK_Widget* GetSibling(CPDFSDK_Widget* pWidget, bool bNext) const; CPDFSDK_Widget* GetWidget(CPDF_FormControl* pControl) const; void GetWidgets(const CFX_WideString& sFieldName, - std::vector<CPDFSDK_Widget*>* widgets) const; + std::vector<CPDFSDK_Annot::ObservedPtr>* widgets) const; void GetWidgets(CPDF_FormField* pField, - std::vector<CPDFSDK_Widget*>* widgets) const; + std::vector<CPDFSDK_Annot::ObservedPtr>* widgets) const; void AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget); void RemoveMap(CPDF_FormControl* pControl); |