OLD | NEW |
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 13 matching lines...) Expand all Loading... |
24 #include "../../include/javascript/report.h" | 24 #include "../../include/javascript/report.h" |
25 #include "../../include/javascript/util.h" | 25 #include "../../include/javascript/util.h" |
26 #include "../../include/javascript/JS_GlobalData.h" | 26 #include "../../include/javascript/JS_GlobalData.h" |
27 #include "../../include/javascript/global.h" | 27 #include "../../include/javascript/global.h" |
28 #include "../../include/javascript/console.h" | 28 #include "../../include/javascript/console.h" |
29 | 29 |
30 CJS_RuntimeFactory::~CJS_RuntimeFactory() | 30 CJS_RuntimeFactory::~CJS_RuntimeFactory() |
31 { | 31 { |
32 } | 32 } |
33 | 33 |
34 IFXJS_Runtime*» » » » » CJS_RuntimeFactory::NewJSRuntime
(CPDFDoc_Environment* pApp) | 34 IFXJS_Runtime* CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environ
ment* pApp) |
35 { | 35 { |
36 » if (!m_bInit) | 36 if (!m_bInit) |
37 » { | 37 { |
38 » » unsigned int embedderDataSlot = 0; | 38 unsigned int embedderDataSlot = 0; |
39 » » if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) { | 39 if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) { |
40 » » » embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatfor
m->m_v8EmbedderSlot; | 40 embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatform->m_v8Embed
derSlot; |
41 } | 41 } |
42 » » JS_Initial(embedderDataSlot); | 42 JS_Initial(embedderDataSlot); |
43 » » m_bInit = TRUE; | 43 m_bInit = TRUE; |
44 » } | 44 } |
45 » return new CJS_Runtime(pApp); | 45 return new CJS_Runtime(pApp); |
46 } | 46 } |
47 void» » » » » » » CJS_RuntimeFactory::AddR
ef() | 47 void CJS_RuntimeFactory::AddRef() |
48 { | 48 { |
49 » //to do.Should be implemented as atom manipulation. | 49 //to do.Should be implemented as atom manipulation. |
50 » m_nRef++; | 50 m_nRef++; |
51 } | 51 } |
52 void» » » » » » » CJS_RuntimeFactory::Rele
ase() | 52 void CJS_RuntimeFactory::Release() |
53 { | 53 { |
54 » if(m_bInit) | 54 if(m_bInit) |
55 » { | 55 { |
56 » » //to do.Should be implemented as atom manipulation. | 56 //to do.Should be implemented as atom manipulation. |
57 » » if (--m_nRef == 0) | 57 if (--m_nRef == 0) |
58 » » { | 58 { |
59 » » » JS_Release(); | 59 JS_Release(); |
60 » » » ReleaseGlobalData(); | 60 ReleaseGlobalData(); |
61 » » » m_bInit = FALSE; | 61 m_bInit = FALSE; |
62 » » } | 62 } |
63 » } | 63 } |
64 } | 64 } |
65 | 65 |
66 void» » » » » » » CJS_RuntimeFactory::Dele
teJSRuntime(IFXJS_Runtime* pRuntime) | 66 void CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtim
e* pRuntime) |
67 { | 67 { |
68 delete (CJS_Runtime*)pRuntime; | 68 delete (CJS_Runtime*)pRuntime; |
69 } | 69 } |
70 | 70 |
71 CJS_GlobalData*»CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp) | 71 CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp) |
72 { | 72 { |
73 » if (m_pGlobalData) | 73 if (m_pGlobalData) |
74 » { | 74 { |
75 » » m_nGlobalDataCount++; | 75 m_nGlobalDataCount++; |
76 » » return m_pGlobalData; | 76 return m_pGlobalData; |
77 » } | 77 } |
78 » else | 78 m_nGlobalDataCount = 1; |
79 » { | 79 m_pGlobalData = new CJS_GlobalData(pApp); |
80 » » m_nGlobalDataCount = 1; | 80 return m_pGlobalData; |
81 » » m_pGlobalData = new CJS_GlobalData(pApp); | |
82 » » return m_pGlobalData; | |
83 » } | |
84 } | 81 } |
85 | 82 |
86 void CJS_RuntimeFactory::ReleaseGlobalData() | 83 void CJS_RuntimeFactory::ReleaseGlobalData() |
87 { | 84 { |
88 » m_nGlobalDataCount--; | 85 m_nGlobalDataCount--; |
89 | 86 |
90 » if (m_nGlobalDataCount <= 0) | 87 if (m_nGlobalDataCount <= 0) |
91 » { | 88 { |
92 » » delete m_pGlobalData; | 89 delete m_pGlobalData; |
93 » » m_pGlobalData = NULL; | 90 m_pGlobalData = NULL; |
94 » } | 91 } |
95 } | 92 } |
96 | 93 |
97 void* CJS_ArrayBufferAllocator::Allocate(size_t length) { | 94 void* CJS_ArrayBufferAllocator::Allocate(size_t length) { |
98 return calloc(1, length); | 95 return calloc(1, length); |
99 } | 96 } |
100 | 97 |
101 void* CJS_ArrayBufferAllocator::AllocateUninitialized(size_t length) { | 98 void* CJS_ArrayBufferAllocator::AllocateUninitialized(size_t length) { |
102 return malloc(length); | 99 return malloc(length); |
103 } | 100 } |
104 | 101 |
105 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) { | 102 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) { |
106 free(data); | 103 free(data); |
107 } | 104 } |
108 | 105 |
109 /* ------------------------------ CJS_Runtime ------------------------------ */ | 106 /* ------------------------------ CJS_Runtime ------------------------------ */ |
110 | 107 |
111 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) : | 108 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) : |
112 » m_pApp(pApp), | 109 m_pApp(pApp), |
113 » m_pDocument(NULL), | 110 m_pDocument(NULL), |
114 » m_bBlocking(FALSE), | 111 m_bBlocking(FALSE), |
115 » m_bRegistered(FALSE), | 112 m_bRegistered(FALSE), |
116 » m_pFieldEventPath(NULL), | 113 m_pFieldEventPath(NULL), |
117 m_isolate(NULL) | 114 m_isolate(NULL) |
118 { | 115 { |
119 » if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) { | 116 if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) { |
120 » » m_isolate = reinterpret_cast<v8::Isolate*>(m_pApp->GetFormFillIn
fo()->m_pJsPlatform->m_isolate); | 117 m_isolate = reinterpret_cast<v8::Isolate*>(m_pApp->GetFormFillInfo()->m_
pJsPlatform->m_isolate); |
121 » } | 118 } |
122 » if (!m_isolate) { | 119 if (!m_isolate) { |
123 » » m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator()); | 120 m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator()); |
124 | 121 |
125 » » v8::Isolate::CreateParams params; | 122 v8::Isolate::CreateParams params; |
126 » » params.array_buffer_allocator = m_pArrayBufferAllocator.get(); | 123 params.array_buffer_allocator = m_pArrayBufferAllocator.get(); |
127 » » m_isolate = v8::Isolate::New(params); | 124 m_isolate = v8::Isolate::New(params); |
128 } | 125 } |
129 | 126 |
130 » InitJSObjects(); | 127 InitJSObjects(); |
131 | 128 |
132 » CJS_Context * pContext = (CJS_Context*)NewContext(); | 129 CJS_Context * pContext = (CJS_Context*)NewContext(); |
133 » JS_InitialRuntime(*this, this, pContext, m_context); | 130 JS_InitialRuntime(*this, this, pContext, m_context); |
134 » ReleaseContext(pContext); | 131 ReleaseContext(pContext); |
135 } | 132 } |
136 | 133 |
137 CJS_Runtime::~CJS_Runtime() | 134 CJS_Runtime::~CJS_Runtime() |
138 { | 135 { |
139 » for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++) | 136 for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++) |
140 » » delete m_ContextArray.GetAt(i); | 137 delete m_ContextArray.GetAt(i); |
141 | 138 |
142 » m_ContextArray.RemoveAll(); | 139 m_ContextArray.RemoveAll(); |
143 | 140 |
144 » JS_ReleaseRuntime(*this, m_context); | 141 JS_ReleaseRuntime(*this, m_context); |
145 | 142 |
146 » RemoveEventsInLoop(m_pFieldEventPath); | 143 RemoveEventsInLoop(m_pFieldEventPath); |
147 | 144 |
148 » m_pApp = NULL; | 145 m_pApp = NULL; |
149 » m_pDocument = NULL; | 146 m_pDocument = NULL; |
150 » m_pFieldEventPath = NULL; | 147 m_pFieldEventPath = NULL; |
151 » m_context.Reset(); | 148 m_context.Reset(); |
152 | 149 |
153 » //m_isolate->Exit(); | 150 //m_isolate->Exit(); |
154 » m_isolate->Dispose(); | 151 m_isolate->Dispose(); |
155 } | 152 } |
156 | 153 |
157 FX_BOOL CJS_Runtime::InitJSObjects() | 154 FX_BOOL CJS_Runtime::InitJSObjects() |
158 { | 155 { |
159 » v8::Isolate::Scope isolate_scope(GetIsolate()); | 156 v8::Isolate::Scope isolate_scope(GetIsolate()); |
160 » v8::HandleScope handle_scope(GetIsolate()); | 157 v8::HandleScope handle_scope(GetIsolate()); |
161 » v8::Local<v8::Context> context = v8::Context::New(GetIsolate()); | 158 v8::Local<v8::Context> context = v8::Context::New(GetIsolate()); |
162 » v8::Context::Scope context_scope(context); | 159 v8::Context::Scope context_scope(context); |
163 » //0 - 8 | 160 //0 - 8 |
164 » if (CJS_Border::Init(*this, JS_STATIC) < 0) return FALSE; | 161 if (CJS_Border::Init(*this, JS_STATIC) < 0) return FALSE; |
165 » if (CJS_Display::Init(*this, JS_STATIC) < 0) return FALSE; | 162 if (CJS_Display::Init(*this, JS_STATIC) < 0) return FALSE; |
166 » if (CJS_Font::Init(*this, JS_STATIC) < 0) return FALSE; | 163 if (CJS_Font::Init(*this, JS_STATIC) < 0) return FALSE; |
167 » if (CJS_Highlight::Init(*this, JS_STATIC) < 0) return FALSE; | 164 if (CJS_Highlight::Init(*this, JS_STATIC) < 0) return FALSE; |
168 » if (CJS_Position::Init(*this, JS_STATIC) < 0) return FALSE; | 165 if (CJS_Position::Init(*this, JS_STATIC) < 0) return FALSE; |
169 » if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0) return FALSE; | 166 if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0) return FALSE; |
170 » if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0) return FALSE; | 167 if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0) return FALSE; |
171 » if (CJS_Style::Init(*this, JS_STATIC) < 0) return FALSE; | 168 if (CJS_Style::Init(*this, JS_STATIC) < 0) return FALSE; |
172 » if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0) return FALSE; | 169 if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0) return FALSE; |
173 | 170 |
174 » //9 - 11 | 171 //9 - 11 |
175 » if (CJS_App::Init(*this, JS_STATIC) < 0) return FALSE; | 172 if (CJS_App::Init(*this, JS_STATIC) < 0) return FALSE; |
176 » if (CJS_Color::Init(*this, JS_STATIC) < 0) return FALSE; | 173 if (CJS_Color::Init(*this, JS_STATIC) < 0) return FALSE; |
177 » if (CJS_Console::Init(*this, JS_STATIC) < 0) return FALSE; | 174 if (CJS_Console::Init(*this, JS_STATIC) < 0) return FALSE; |
178 | 175 |
179 » //12 - 14 | 176 //12 - 14 |
180 » if (CJS_Document::Init(*this, JS_DYNAMIC) < 0) return FALSE; | 177 if (CJS_Document::Init(*this, JS_DYNAMIC) < 0) return FALSE; |
181 » if (CJS_Event::Init(*this, JS_STATIC) < 0) return FALSE; | 178 if (CJS_Event::Init(*this, JS_STATIC) < 0) return FALSE; |
182 » if (CJS_Field::Init(*this, JS_DYNAMIC) < 0) return FALSE; | 179 if (CJS_Field::Init(*this, JS_DYNAMIC) < 0) return FALSE; |
183 | 180 |
184 » //15 - 17 | 181 //15 - 17 |
185 » if (CJS_Global::Init(*this, JS_STATIC) < 0) return FALSE; | 182 if (CJS_Global::Init(*this, JS_STATIC) < 0) return FALSE; |
186 » if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0) return FALSE; | 183 if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0) return FALSE; |
187 » if (CJS_Util::Init(*this, JS_STATIC) < 0) return FALSE; | 184 if (CJS_Util::Init(*this, JS_STATIC) < 0) return FALSE; |
188 | 185 |
189 » if (CJS_PublicMethods::Init(*this) < 0) return FALSE; | 186 if (CJS_PublicMethods::Init(*this) < 0) return FALSE; |
190 » if (CJS_GlobalConsts::Init(*this) < 0) return FALSE; | 187 if (CJS_GlobalConsts::Init(*this) < 0) return FALSE; |
191 » if (CJS_GlobalArrays::Init(*this) < 0) return FALSE; | 188 if (CJS_GlobalArrays::Init(*this) < 0) return FALSE; |
192 | 189 |
193 » if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0) return FALSE; | 190 if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0) return FALSE; |
194 » if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) <0) return FALSE; | 191 if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) <0) return FALSE; |
195 | 192 |
196 » return TRUE; | 193 return TRUE; |
197 } | 194 } |
198 | 195 |
199 IFXJS_Context* CJS_Runtime::NewContext() | 196 IFXJS_Context* CJS_Runtime::NewContext() |
200 { | 197 { |
201 » CJS_Context * p = new CJS_Context(this); | 198 CJS_Context * p = new CJS_Context(this); |
202 » m_ContextArray.Add(p); | 199 m_ContextArray.Add(p); |
203 » return p; | 200 return p; |
204 } | 201 } |
205 | 202 |
206 void CJS_Runtime::ReleaseContext(IFXJS_Context * pContext) | 203 void CJS_Runtime::ReleaseContext(IFXJS_Context * pContext) |
207 { | 204 { |
208 » CJS_Context* pJSContext = (CJS_Context*)pContext; | 205 CJS_Context* pJSContext = (CJS_Context*)pContext; |
209 | 206 |
210 » for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++) | 207 for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++) |
211 » { | 208 { |
212 » » if (pJSContext == m_ContextArray.GetAt(i)) | 209 if (pJSContext == m_ContextArray.GetAt(i)) |
213 » » { | 210 { |
214 » » » delete pJSContext; | 211 delete pJSContext; |
215 » » » m_ContextArray.RemoveAt(i); | 212 m_ContextArray.RemoveAt(i); |
216 » » » break; | 213 break; |
217 » » } | 214 } |
218 » } | 215 } |
219 } | 216 } |
220 | 217 |
221 IFXJS_Context*» CJS_Runtime::GetCurrentContext() | 218 IFXJS_Context* CJS_Runtime::GetCurrentContext() |
222 { | 219 { |
223 » if(!m_ContextArray.GetSize()) | 220 if(!m_ContextArray.GetSize()) |
224 » » return NULL; | 221 return NULL; |
225 » return m_ContextArray.GetAt(m_ContextArray.GetSize()-1); | 222 return m_ContextArray.GetAt(m_ContextArray.GetSize()-1); |
226 } | 223 } |
227 | 224 |
228 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) | 225 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) |
229 { | 226 { |
230 » if (m_pDocument != pReaderDoc) | 227 if (m_pDocument != pReaderDoc) |
231 » { | 228 { |
232 » » v8::Isolate::Scope isolate_scope(m_isolate); | 229 v8::Isolate::Scope isolate_scope(m_isolate); |
233 » » v8::HandleScope handle_scope(m_isolate); | 230 v8::HandleScope handle_scope(m_isolate); |
234 » » v8::Local<v8::Context> context =v8::Local<v8::Context>::New(m_is
olate, m_context); | 231 v8::Local<v8::Context> context =v8::Local<v8::Context>::New(m_isolate, m
_context); |
235 » » v8::Context::Scope context_scope(context); | 232 v8::Context::Scope context_scope(context); |
236 | 233 |
237 » » m_pDocument = pReaderDoc; | 234 m_pDocument = pReaderDoc; |
238 | 235 |
239 » » if (pReaderDoc) | 236 if (pReaderDoc) |
240 » » { | 237 { |
241 » » » JSObject pThis = JS_GetThisObj(*this); | 238 JSObject pThis = JS_GetThisObj(*this); |
242 » » » if(!pThis.IsEmpty()) | 239 if(!pThis.IsEmpty()) |
243 » » » { | 240 { |
244 » » » » if (JS_GetObjDefnID(pThis) == JS_GetObjDefnID(*t
his, L"Document")) | 241 if (JS_GetObjDefnID(pThis) == JS_GetObjDefnID(*this, L"Document"
)) |
245 » » » » { | 242 { |
246 » » » » » if (CJS_Document* pJSDocument = (CJS_Doc
ument*)JS_GetPrivate(pThis)) | 243 if (CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate
(pThis)) |
247 » » » » » { | 244 { |
248 » » » » » » if (Document * pDocument = (Docu
ment*)pJSDocument->GetEmbedObject()) | 245 if (Document * pDocument = (Document*)pJSDocument->GetEm
bedObject()) |
249 » » » » » » » pDocument->AttachDoc(pRe
aderDoc); | 246 pDocument->AttachDoc(pReaderDoc); |
250 » » » » » } | 247 } |
251 » » » » } | 248 } |
252 » » » } | 249 } |
253 » » » JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document")
); | 250 JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document")); |
254 » » } | 251 } |
255 » » else | 252 else |
256 » » { | 253 { |
257 » » » JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app")); | 254 JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app")); |
258 » » } | 255 } |
259 » } | 256 } |
260 } | 257 } |
261 | 258 |
262 FX_BOOL»CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName, JS_EVENT_
T eEventType) | 259 FX_BOOL CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName, JS_EVENT_
T eEventType) |
263 { | 260 { |
264 » if (m_pFieldEventPath == NULL) | 261 if (m_pFieldEventPath == NULL) |
265 » { | 262 { |
266 » » m_pFieldEventPath = new CJS_FieldEvent; | 263 m_pFieldEventPath = new CJS_FieldEvent; |
267 » » m_pFieldEventPath->sTargetName = sTargetName; | 264 m_pFieldEventPath->sTargetName = sTargetName; |
268 » » m_pFieldEventPath->eEventType = eEventType; | 265 m_pFieldEventPath->eEventType = eEventType; |
269 » » m_pFieldEventPath->pNext = NULL; | 266 m_pFieldEventPath->pNext = NULL; |
270 | 267 |
271 » » return TRUE; | 268 return TRUE; |
272 » } | 269 } |
273 | 270 |
274 » //to search | 271 //to search |
275 » CJS_FieldEvent* p = m_pFieldEventPath; | 272 CJS_FieldEvent* p = m_pFieldEventPath; |
276 » CJS_FieldEvent* pLast = m_pFieldEventPath; | 273 CJS_FieldEvent* pLast = m_pFieldEventPath; |
277 » while (p) | 274 while (p) |
278 » { | 275 { |
279 » » if (p->eEventType == eEventType && p->sTargetName == sTargetName
) | 276 if (p->eEventType == eEventType && p->sTargetName == sTargetName) |
280 » » » return FALSE; | 277 return FALSE; |
281 | 278 |
282 » » pLast = p; | 279 pLast = p; |
283 » » p = p->pNext; | 280 p = p->pNext; |
284 » } | 281 } |
285 | 282 |
286 » //to add | 283 //to add |
287 » CJS_FieldEvent* pNew = new CJS_FieldEvent; | 284 CJS_FieldEvent* pNew = new CJS_FieldEvent; |
288 » pNew->sTargetName = sTargetName; | 285 pNew->sTargetName = sTargetName; |
289 » pNew->eEventType = eEventType; | 286 pNew->eEventType = eEventType; |
290 » pNew->pNext = NULL; | 287 pNew->pNext = NULL; |
291 | 288 |
292 » pLast->pNext = pNew; | 289 pLast->pNext = pNew; |
293 | 290 |
294 » return TRUE; | 291 return TRUE; |
295 } | 292 } |
296 | 293 |
297 void CJS_Runtime::RemoveEventInLoop(const CFX_WideString& sTargetName, JS_EVENT_
T eEventType) | 294 void CJS_Runtime::RemoveEventInLoop(const CFX_WideString& sTargetName, JS_EVENT_
T eEventType) |
298 { | 295 { |
299 » FX_BOOL bFind = FALSE; | 296 FX_BOOL bFind = FALSE; |
300 | 297 |
301 » CJS_FieldEvent* p = m_pFieldEventPath; | 298 CJS_FieldEvent* p = m_pFieldEventPath; |
302 » CJS_FieldEvent* pLast = NULL; | 299 CJS_FieldEvent* pLast = NULL; |
303 » while (p) | 300 while (p) |
304 » { | 301 { |
305 » » if (p->eEventType == eEventType && p->sTargetName == sTargetName
) | 302 if (p->eEventType == eEventType && p->sTargetName == sTargetName) |
306 » » { | 303 { |
307 » » » bFind = TRUE; | 304 bFind = TRUE; |
308 » » » break; | 305 break; |
309 » » } | 306 } |
310 | 307 |
311 » » pLast = p; | 308 pLast = p; |
312 » » p = p->pNext; | 309 p = p->pNext; |
313 » } | 310 } |
314 | 311 |
315 » if (bFind) | 312 if (bFind) |
316 » { | 313 { |
317 » » RemoveEventsInLoop(p); | 314 RemoveEventsInLoop(p); |
318 | 315 |
319 » » if (p == m_pFieldEventPath) | 316 if (p == m_pFieldEventPath) |
320 » » » m_pFieldEventPath = NULL; | 317 m_pFieldEventPath = NULL; |
321 | 318 |
322 » » if (pLast) | 319 if (pLast) |
323 » » » pLast->pNext = NULL; | 320 pLast->pNext = NULL; |
324 » } | 321 } |
325 } | 322 } |
326 | 323 |
327 void CJS_Runtime::RemoveEventsInLoop(CJS_FieldEvent* pStart) | 324 void CJS_Runtime::RemoveEventsInLoop(CJS_FieldEvent* pStart) |
328 { | 325 { |
329 » CJS_FieldEvent* p = pStart; | 326 CJS_FieldEvent* p = pStart; |
330 | 327 |
331 » while (p) | 328 while (p) |
332 » { | 329 { |
333 » » CJS_FieldEvent* pOld = p; | 330 CJS_FieldEvent* pOld = p; |
334 » » p = pOld->pNext; | 331 p = pOld->pNext; |
335 | 332 |
336 » » delete pOld; | 333 delete pOld; |
337 » } | 334 } |
338 } | 335 } |
339 | 336 |
340 v8::Local<v8::Context>» CJS_Runtime::NewJSContext() | 337 v8::Local<v8::Context> CJS_Runtime::NewJSContext() |
341 { | 338 { |
342 » return v8::Local<v8::Context>::New(m_isolate, m_context); | 339 return v8::Local<v8::Context>::New(m_isolate, m_context); |
343 } | 340 } |
344 | 341 |
345 CFX_WideString ChangeObjName(const CFX_WideString& str) | 342 CFX_WideString ChangeObjName(const CFX_WideString& str) |
346 { | 343 { |
347 » CFX_WideString sRet = str; | 344 CFX_WideString sRet = str; |
348 » sRet.Replace(L"_", L"."); | 345 sRet.Replace(L"_", L"."); |
349 » return sRet; | 346 return sRet; |
350 } | 347 } |
OLD | NEW |