diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-04-05 11:58:17 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-04-05 11:58:17 -0700 |
| commit | 13789cc6b1e8c19889ba81191be8ceba1172fda7 (patch) | |
| tree | 460cb088e2fa7220829dd60b9bdc8d6217766352 /fpdfsdk/include | |
| parent | 2195b51b96b25a5b0f7bfc7979bd7f395f0d7ece (diff) | |
| download | pdfium-13789cc6b1e8c19889ba81191be8ceba1172fda7.tar.xz | |
Merge to M50: Re-land "Preserve m_pDynamicObjsMap until FXJS_PerIsolateData is destroyed.""
Fix the destruction order.
This reverts commit 129a60ec2d4d98ed953beaca629c99a52fb7e9b0.
BUG=594120
Original Review URL: https://codereview.chromium.org/1831723004 .
(cherry picked from commit 9967cc5861fbff894eed8fca40e1e5ed524b04c6)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1860133002 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/jsapi/fxjs_v8.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 76373ac4bc..4ec1c331e5 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -97,7 +97,8 @@ class FXJS_PerIsolateData { static void SetUp(v8::Isolate* pIsolate); static FXJS_PerIsolateData* Get(v8::Isolate* pIsolate); void CreateDynamicObjsMap(v8::Isolate* pIsolate) { - m_pDynamicObjsMap = new V8TemplateMap(pIsolate); + if (!m_pDynamicObjsMap) + m_pDynamicObjsMap = new V8TemplateMap(pIsolate); } void ReleaseDynamicObjsMap() { delete m_pDynamicObjsMap; |