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

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

Issue 1347833002: Ensure functions in FXJS_V8 are prefixed by FXJS_. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase, nits, format. 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/src/javascript/JS_EventHandler.cpp ('k') | fpdfsdk/src/javascript/JS_Runtime.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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void CJS_EmbedObj::EndTimer(CJS_Timer* pTimer) { 67 void CJS_EmbedObj::EndTimer(CJS_Timer* pTimer) {
68 ASSERT(pTimer != NULL); 68 ASSERT(pTimer != NULL);
69 pTimer->KillJSTimer(); 69 pTimer->KillJSTimer();
70 delete pTimer; 70 delete pTimer;
71 } 71 }
72 72
73 void FreeObject(const v8::WeakCallbackInfo<CJS_Object>& data) { 73 void FreeObject(const v8::WeakCallbackInfo<CJS_Object>& data) {
74 CJS_Object* pJSObj = data.GetParameter(); 74 CJS_Object* pJSObj = data.GetParameter();
75 pJSObj->ExitInstance(); 75 pJSObj->ExitInstance();
76 delete pJSObj; 76 delete pJSObj;
77 JS_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) : m_pEmbedObj(NULL) {
87 v8::Local<v8::Context> context = pObject->CreationContext(); 87 v8::Local<v8::Context> context = pObject->CreationContext();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 156 }
157 } 157 }
158 } 158 }
159 159
160 // static 160 // static
161 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() { 161 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() {
162 // Leak the timer array at shutdown. 162 // Leak the timer array at shutdown.
163 static auto* s_TimerMap = new TimerMap; 163 static auto* s_TimerMap = new TimerMap;
164 return s_TimerMap; 164 return s_TimerMap;
165 } 165 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/javascript/JS_EventHandler.cpp ('k') | fpdfsdk/src/javascript/JS_Runtime.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698