From 8832fbf53cf71d4d4cb53986d9cfc024edd2bf1f Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 8 Sep 2016 10:25:55 -0700 Subject: Replace CJS_Runtime::Observer with CFX_Runtime::Observer Previously, the observer set a flag which conditionalized a null pointer return. Now, we just clear the pointer. Destruction order matters, so add a method to trigger notifications. Review-Url: https://codereview.chromium.org/2322743002 --- fpdfsdk/javascript/cjs_runtime.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'fpdfsdk/javascript/cjs_runtime.cpp') diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index b12a3f5eeb..67d45d5e4a 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -124,9 +124,7 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) } CJS_Runtime::~CJS_Runtime() { - for (auto* obs : m_observers) - obs->OnDestroyed(); - + NotifyObservers(); ReleaseEngine(); if (m_isolateManaged) { GetIsolate()->Dispose(); @@ -255,16 +253,6 @@ void CJS_Runtime::RemoveEventFromSet(const FieldEvent& event) { m_FieldEventSet.erase(event); } -void CJS_Runtime::AddObserver(Observer* observer) { - ASSERT(!pdfium::ContainsKey(m_observers, observer)); - m_observers.insert(observer); -} - -void CJS_Runtime::RemoveObserver(Observer* observer) { - ASSERT(pdfium::ContainsKey(m_observers, observer)); - m_observers.erase(observer); -} - #ifdef PDF_ENABLE_XFA CFX_WideString ChangeObjName(const CFX_WideString& str) { CFX_WideString sRet = str; -- cgit v1.2.3