From 1c62054a42cf0759148501a36c541de5d5769d32 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 12 Sep 2016 09:47:52 -0700 Subject: Make CFX_Obeservable::Observer into a pointer-ish type; This may be a better design because it avoids having a level of indirection that the Observer required. Review-Url: https://codereview.chromium.org/2326763002 --- fpdfsdk/javascript/Annot.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/javascript/Annot.h') diff --git a/fpdfsdk/javascript/Annot.h b/fpdfsdk/javascript/Annot.h index c8b0afb556..21ad6d017a 100644 --- a/fpdfsdk/javascript/Annot.h +++ b/fpdfsdk/javascript/Annot.h @@ -12,7 +12,7 @@ #include "fpdfsdk/include/cpdfsdk_baannot.h" #include "fpdfsdk/javascript/JS_Define.h" -class Annot : public CJS_EmbedObj, public CPDFSDK_Annot::Observer { +class Annot : public CJS_EmbedObj { public: explicit Annot(CJS_Object* pJSObject); ~Annot() override; @@ -24,7 +24,7 @@ class Annot : public CJS_EmbedObj, public CPDFSDK_Annot::Observer { void SetSDKAnnot(CPDFSDK_BAAnnot* annot); private: - CPDFSDK_Annot* m_pAnnot = nullptr; + CPDFSDK_Annot::ObservedPtr m_pAnnot; }; class CJS_Annot : public CJS_Object { -- cgit v1.2.3