Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Side by Side Diff: fpdfsdk/src/javascript/JS_Runtime.cpp

Issue 1386823002: Only call DefineJSObjects() once for the global V8 isolate. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/include/jsapi/fxjs_v8.h ('k') | fpdfsdk/src/jsapi/fxjs_v8.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../include/javascript/JavaScript.h" 7 #include "../../include/javascript/JavaScript.h"
8 #include "../../include/javascript/IJavaScript.h" 8 #include "../../include/javascript/IJavaScript.h"
9 #include "../../include/javascript/JS_EventHandler.h" 9 #include "../../include/javascript/JS_EventHandler.h"
10 #include "../../include/javascript/JS_Runtime.h" 10 #include "../../include/javascript/JS_Runtime.h"
(...skipping 27 matching lines...) Expand all
38 if (pPlatform->version <= 2) { 38 if (pPlatform->version <= 2) {
39 unsigned int embedderDataSlot = 0; 39 unsigned int embedderDataSlot = 0;
40 v8::Isolate* pExternalIsolate = nullptr; 40 v8::Isolate* pExternalIsolate = nullptr;
41 if (pPlatform->version == 2) { 41 if (pPlatform->version == 2) {
42 pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate); 42 pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate);
43 embedderDataSlot = pPlatform->m_v8EmbedderSlot; 43 embedderDataSlot = pPlatform->m_v8EmbedderSlot;
44 } 44 }
45 FXJS_Initialize(embedderDataSlot, pExternalIsolate); 45 FXJS_Initialize(embedderDataSlot, pExternalIsolate);
46 } 46 }
47 m_isolateManaged = FXJS_GetIsolate(&m_isolate); 47 m_isolateManaged = FXJS_GetIsolate(&m_isolate);
48 DefineJSObjects(); 48 if (m_isolateManaged || FXJS_GlobalIsolateRefCount() == 0)
49 DefineJSObjects();
49 50
50 CJS_Context* pContext = (CJS_Context*)NewContext(); 51 CJS_Context* pContext = (CJS_Context*)NewContext();
51 FXJS_InitializeRuntime(GetIsolate(), this, pContext, m_context); 52 FXJS_InitializeRuntime(GetIsolate(), this, pContext, m_context);
52 ReleaseContext(pContext); 53 ReleaseContext(pContext);
53 } 54 }
54 55
55 CJS_Runtime::~CJS_Runtime() { 56 CJS_Runtime::~CJS_Runtime() {
56 for (auto* obs : m_observers) 57 for (auto* obs : m_observers)
57 obs->OnDestroyed(); 58 obs->OnDestroyed();
58 59
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 void CJS_Runtime::RemoveObserver(Observer* observer) { 187 void CJS_Runtime::RemoveObserver(Observer* observer) {
187 ASSERT(m_observers.find(observer) != m_observers.end()); 188 ASSERT(m_observers.find(observer) != m_observers.end());
188 m_observers.erase(observer); 189 m_observers.erase(observer);
189 } 190 }
190 191
191 CFX_WideString ChangeObjName(const CFX_WideString& str) { 192 CFX_WideString ChangeObjName(const CFX_WideString& str) {
192 CFX_WideString sRet = str; 193 CFX_WideString sRet = str;
193 sRet.Replace(L"_", L"."); 194 sRet.Replace(L"_", L".");
194 return sRet; 195 return sRet;
195 } 196 }
OLDNEW
« no previous file with comments | « fpdfsdk/include/jsapi/fxjs_v8.h ('k') | fpdfsdk/src/jsapi/fxjs_v8.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698