diff options
author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-17 10:46:25 -0800 |
---|---|---|
committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-11-17 10:52:50 -0800 |
commit | 0ed3b28a70c64e06340b892e6b5e753f80b0fa4e (patch) | |
tree | 4242bbd769b19621e9131cff0fb3b5d837913051 /fpdfsdk/src/jsapi | |
parent | 2b7a49dabdac7c31975f2662f6513c0930617231 (diff) | |
download | pdfium-0ed3b28a70c64e06340b892e6b5e753f80b0fa4e.tar.xz |
Merge to XFA: patch from CL 730993002
Diffstat (limited to 'fpdfsdk/src/jsapi')
-rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index dcad30edaf..f57465c92a 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -93,7 +93,7 @@ int JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* s v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); - CFX_WideString ws = CFX_WideString((FX_LPCWSTR)sMethodName); + CFX_WideString ws = CFX_WideString(sMethodName); CFX_ByteString bsMethodName = ws.UTF8Encode(); CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(1); @@ -113,7 +113,7 @@ int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); - CFX_WideString ws = CFX_WideString((FX_LPCWSTR)sPropName); + CFX_WideString ws = CFX_WideString(sPropName); CFX_ByteString bsPropertyName = ws.UTF8Encode(); CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(1); @@ -153,7 +153,7 @@ int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sC CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(1); if(!pArray) return 0; - CFX_WideString ws = CFX_WideString((FX_LPCWSTR)sConstName); + CFX_WideString ws = CFX_WideString(sConstName); CFX_ByteString bsConstName = ws.UTF8Encode(); if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0; @@ -188,7 +188,7 @@ int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); - CFX_WideString ws = CFX_WideString((FX_LPCWSTR)sMethodName); + CFX_WideString ws = CFX_WideString(sMethodName); CFX_ByteString bsMethodName = ws.UTF8Encode(); v8::Local<v8::FunctionTemplate> funTempl = v8::FunctionTemplate::New(isolate, pMethodCall); @@ -212,7 +212,7 @@ int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8: v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); - CFX_WideString ws = CFX_WideString((FX_LPCWSTR)sConstName); + CFX_WideString ws = CFX_WideString(sConstName); CFX_ByteString bsConst= ws.UTF8Encode(); v8::Local<v8::ObjectTemplate> objTemp; |