CJS_Timer should observe CJS_Runtime destruction.

fpdfsdk/src/javascript/JS_Runtime.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
-#include "../../include/javascript/Document.h"
 #include "../../include/javascript/app.h"
 #include "../../include/javascript/color.h"
 #include "../../include/javascript/Consts.h"
 #include "../../include/javascript/Document.h"
 #include "../../include/javascript/event.h"
 #include "../../include/javascript/Field.h"
 #include "../../include/javascript/Icon.h"
 #include "../../include/javascript/PublicMethods.h"
 #include "../../include/javascript/report.h"
 #include "../../include/javascript/util.h"
@@ skipping 21 matching lines @@
   }
   m_isolateManaged = FXJS_GetIsolate(&m_isolate);
   DefineJSObjects();
 
   CJS_Context* pContext = (CJS_Context*)NewContext();
   FXJS_InitializeRuntime(GetIsolate(), this, pContext, m_context);
   ReleaseContext(pContext);
 }
 
 CJS_Runtime::~CJS_Runtime() {
+  for (auto* obs : m_observers)
+    obs->OnDestroyed();
+
   for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++)
     delete m_ContextArray.GetAt(i);
 
   m_ContextArray.RemoveAll();
   FXJS_ReleaseRuntime(GetIsolate(), m_context);
 
   m_pApp = NULL;
   m_pDocument = NULL;
   m_context.Reset();
 
@@ skipping 102 matching lines @@
 }
 
 void CJS_Runtime::RemoveEventFromSet(const FieldEvent& event) {
   m_FieldEventSet.erase(event);
 }
 
 v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
   return v8::Local<v8::Context>::New(m_isolate, m_context);
 }
 
+void CJS_Runtime::AddObserver(Observer* observer) {
+  m_observers.insert(observer);

[Tom Sepez, 2015/10/04 22:39:38]

nit: do we want to assert it isn't already in there?

[Lei Zhang, 2015/10/04 23:01:28]

Sure. I put it as:

ASSERT(m_observers.find(observer) == m_observers.end());

because if I write it as:

bool added = m_observers.insert(observer).second;
ASSERT(added);

then I get compiler warnings about unused variables.

+}
+
+void CJS_Runtime::RemoveObserver(Observer* observer) {
+  m_observers.erase(observer);
+}
+
 CFX_WideString ChangeObjName(const CFX_WideString& str) {
   CFX_WideString sRet = str;
   sRet.Replace(L"_", L".");
   return sRet;
 }