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

Side by Side Diff: fpdfsdk/src/jsapi/fxjs_v8.cpp

Issue 809513002: XFA: merge patch from issue 801913002 and 804463003 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 6 years 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/app.cpp ('k') | fpdfsdk/src/pdfwindow/PWL_FontMap.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 "../../../core/include/fxcrt/fx_basic.h" 7 #include "../../../core/include/fxcrt/fx_basic.h"
8 #include "../../../core/include/fxcrt/fx_ext.h" 8 #include "../../../core/include/fxcrt/fx_ext.h"
9 #include "../../include/jsapi/fxjs_v8.h" 9 #include "../../include/jsapi/fxjs_v8.h"
10 #include "../../include/fsdk_define.h" 10 #include "../../include/fsdk_define.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 305 }
306 delete pObjDef; 306 delete pObjDef;
307 } 307 }
308 delete pArray; 308 delete pArray;
309 isolate->SetData(1,NULL); 309 isolate->SetData(1,NULL);
310 isolate->SetData(2,NULL); 310 isolate->SetData(2,NULL);
311 } 311 }
312 312
313 void JS_Initial() 313 void JS_Initial()
314 { 314 {
315 //#ifndef FOXIT_CHROME_BUILD
316 // v8::V8::InitializeICU();
317 //#endif
318 } 315 }
319 void JS_Release() 316 void JS_Release()
320 { 317 {
321 318
322 } 319 }
323 int JS_Parse(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror) 320 int JS_Parse(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror)
324 { 321 {
325 v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; 322 v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
326 v8::Isolate::Scope isolate_scope(isolate); 323 v8::Isolate::Scope isolate_scope(isolate);
327 v8::TryCatch try_catch; 324 v8::TryCatch try_catch;
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 { 1034 {
1038 return d != d; 1035 return d != d;
1039 } 1036 }
1040 1037
1041 double JS_LocalTime(double d) 1038 double JS_LocalTime(double d)
1042 { 1039 {
1043 return JS_GetDateTime() + _getDaylightSavingTA(d); 1040 return JS_GetDateTime() + _getDaylightSavingTA(d);
1044 } 1041 }
1045 1042
1046 //JavaScript time implement End. 1043 //JavaScript time implement End.
OLDNEW
« no previous file with comments | « fpdfsdk/src/javascript/app.cpp ('k') | fpdfsdk/src/pdfwindow/PWL_FontMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698