From ce04a458828b45035dab46c13e14a1f0ae67a2b7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 7 Sep 2016 05:46:55 -0700 Subject: Add observer for BAAnnots from Javascript This Cl moves the observer code from the CPDFSDK_Widget up into the CPDFSDK_Annot base class and then adds a second observer for CPDFSDK_BAAnnot objects. This allows us to attach an observer to the Annot javascript class which will update its internal pointer to the BAAnnot if the BAAnnot is destroyed by the CPDFSDK_PageView being destroyed. BUG=chromium:642307 Review-Url: https://codereview.chromium.org/2306663002 --- fpdfsdk/include/cpdfsdk_widget.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'fpdfsdk/include/cpdfsdk_widget.h') diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h index 51116f9581..88692d553e 100644 --- a/fpdfsdk/include/cpdfsdk_widget.h +++ b/fpdfsdk/include/cpdfsdk_widget.h @@ -35,17 +35,6 @@ class CXFA_FFWidgetHandler; class CPDFSDK_Widget : public CPDFSDK_BAAnnot { public: - class Observer { - public: - explicit Observer(CPDFSDK_Widget** pWatchedPtr); - ~Observer(); - - void OnWidgetDestroyed(); - - private: - CPDFSDK_Widget** m_pWatchedPtr; - }; - #ifdef PDF_ENABLE_XFA CXFA_FFWidget* GetMixXFAWidget() const; CXFA_FFWidget* GetGroupMixXFAWidget(); @@ -75,9 +64,6 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CPDFSDK_InterForm* pInterForm); ~CPDFSDK_Widget() override; - void AddObserver(Observer* observer); - void RemoveObserver(Observer* observer); - bool IsSignatureWidget() const override; CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override; FX_BOOL IsAppearanceValid() override; @@ -180,7 +166,6 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { FX_BOOL m_bAppModified; int32_t m_nAppAge; int32_t m_nValueAge; - std::set m_Observers; #ifdef PDF_ENABLE_XFA mutable CXFA_FFWidget* m_hMixXFAWidget; -- cgit v1.2.3