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

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

Issue 1357243002: Merge to XFA:More tidy of CJS_Object, kill implicit cast operator (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 3 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/javascript/JS_Object.h ('k') | fpdfsdk/src/javascript/JS_Value.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_Define.h" 9 #include "../../include/javascript/JS_Define.h"
10 #include "../../include/javascript/JS_Object.h" 10 #include "../../include/javascript/JS_Object.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 delete pJSObj; 76 delete pJSObj;
77 FXJS_FreePrivate(data.GetInternalField(0)); 77 FXJS_FreePrivate(data.GetInternalField(0));
78 } 78 }
79 79
80 void DisposeObject(const v8::WeakCallbackInfo<CJS_Object>& data) { 80 void DisposeObject(const v8::WeakCallbackInfo<CJS_Object>& data) {
81 CJS_Object* pJSObj = data.GetParameter(); 81 CJS_Object* pJSObj = data.GetParameter();
82 pJSObj->Dispose(); 82 pJSObj->Dispose();
83 data.SetSecondPassCallback(FreeObject); 83 data.SetSecondPassCallback(FreeObject);
84 } 84 }
85 85
86 CJS_Object::CJS_Object(v8::Local<v8::Object> pObject) : m_pEmbedObj(NULL) { 86 CJS_Object::CJS_Object(v8::Local<v8::Object> pObject) {
87 v8::Local<v8::Context> context = pObject->CreationContext(); 87 m_pIsolate = pObject->CreationContext()->GetIsolate();
88 m_pIsolate = context->GetIsolate(); 88 m_pV8Object.Reset(m_pIsolate, pObject);
89 m_pObject.Reset(m_pIsolate, pObject); 89 }
90 };
91 90
92 CJS_Object::~CJS_Object() { 91 CJS_Object::~CJS_Object() {
93 m_pObject.Reset(); 92 }
94 };
95 93
96 void CJS_Object::MakeWeak() { 94 void CJS_Object::MakeWeak() {
97 m_pObject.SetWeak(this, DisposeObject, v8::WeakCallbackType::kInternalFields); 95 m_pV8Object.SetWeak(this, DisposeObject,
96 v8::WeakCallbackType::kInternalFields);
98 } 97 }
99 98
100 void CJS_Object::Dispose() { 99 void CJS_Object::Dispose() {
101 m_pObject.Reset(); 100 m_pV8Object.Reset();
102 } 101 }
103 102
104 CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc) { 103 CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc) {
105 return FXJS_GetPageView(cc); 104 return FXJS_GetPageView(cc);
106 } 105 }
107 106
108 int CJS_Object::MsgBox(CPDFDoc_Environment* pApp, 107 int CJS_Object::MsgBox(CPDFDoc_Environment* pApp,
109 CPDFSDK_PageView* pPageView, 108 CPDFSDK_PageView* pPageView,
110 const FX_WCHAR* swMsg, 109 const FX_WCHAR* swMsg,
111 const FX_WCHAR* swTitle, 110 const FX_WCHAR* swTitle,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 155 }
157 } 156 }
158 } 157 }
159 158
160 // static 159 // static
161 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() { 160 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() {
162 // Leak the timer array at shutdown. 161 // Leak the timer array at shutdown.
163 static auto* s_TimerMap = new TimerMap; 162 static auto* s_TimerMap = new TimerMap;
164 return s_TimerMap; 163 return s_TimerMap;
165 } 164 }
OLDNEW
« no previous file with comments | « fpdfsdk/include/javascript/JS_Object.h ('k') | fpdfsdk/src/javascript/JS_Value.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698