commit 7ea305f1bd4efc1838fba053e4399358d6765ec7
author Jochen Eisinger <jochen@chromium.org> Wed Aug 05 08:55:39 2015 +0200
committer Jochen Eisinger <jochen@chromium.org> Wed Aug 05 08:55:39 2015 +0200
tree 8d3e952fcfa3880dedcfc2064f12fb7c342fd059
parent 7f6b084fbdde785240f2509ae3617a17937f97ba

Don't dispose the isolate if its provided by the embedder

BUG=chromium:515718
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1269783005 .

fpdfsdk/include/javascript/JS_Runtime.h

diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index f4dabf0..3be0f76 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -68,6 +68,7 @@
   CJS_FieldEvent* m_pFieldEventPath;
 
   v8::Isolate* m_isolate;
+  bool m_isolateManaged;
   nonstd::unique_ptr<CJS_ArrayBufferAllocator> m_pArrayBufferAllocator;
   v8::Global<v8::Context> m_context;
 };

fpdfsdk/src/javascript/JS_Runtime.cpp

diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 08cd87c..4ef34a8 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -98,7 +98,8 @@
       m_pDocument(NULL),
       m_bBlocking(FALSE),
       m_pFieldEventPath(NULL),
-      m_isolate(NULL) {
+      m_isolate(NULL),
+      m_isolateManaged(false) {
   if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
     m_isolate = reinterpret_cast<v8::Isolate*>(
         m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
@@ -109,6 +110,7 @@
     v8::Isolate::CreateParams params;
     params.array_buffer_allocator = m_pArrayBufferAllocator.get();
     m_isolate = v8::Isolate::New(params);
+    m_isolateManaged = true;
   }
 
   InitJSObjects();
@@ -133,8 +135,8 @@
   m_pFieldEventPath = NULL;
   m_context.Reset();
 
-  // m_isolate->Exit();
-  m_isolate->Dispose();
+  if (m_isolateManaged)
+    m_isolate->Dispose();
 }
 
 FX_BOOL CJS_Runtime::InitJSObjects() {