Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.

Nearly automatic merge + re-run script on new files.

Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1174303002.

1 files changed, 12 insertions, 12 deletions

diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index 56187158d5..368acd18ad 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -50,10 +50,10 @@ public:
     void*		GetObject(int32_t index, FXJSE_HCLASS hClass = NULL) const;

     FXJSE_HVALUE	GetReturnValue();

 };

-typedef void	(*FXJSE_FuncCallback)	(FXJSE_HOBJECT hThis,	FX_BSTR szFuncName, CFXJSE_Arguments &args);

-typedef void	(*FXJSE_PropAccessor)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);

-typedef int32_t(*FXJSE_PropTypeGetter)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);

-typedef FX_BOOL (*FXJSE_PropDeleter)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName);

+typedef void	(*FXJSE_FuncCallback)	(FXJSE_HOBJECT hThis,	const CFX_ByteStringC& szFuncName, CFXJSE_Arguments &args);

+typedef void	(*FXJSE_PropAccessor)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);

+typedef int32_t(*FXJSE_PropTypeGetter)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FX_BOOL bQueryIn);

+typedef FX_BOOL (*FXJSE_PropDeleter)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName);

 typedef struct _FXJSE_FUNCTION {

     const FX_CHAR*				name;

     FXJSE_FuncCallback		callbackProc;

@@ -84,7 +84,7 @@ typedef struct _FXJSE_CLASS {
     FXJSE_FuncCallback		dynMethodCall;

 } FXJSE_CLASS;

 FXJSE_HCLASS	FXJSE_DefineClass(FXJSE_HCONTEXT hContext, const FXJSE_CLASS* lpClass);

-FXJSE_HCLASS	FXJSE_GetClass(FXJSE_HCONTEXT hContext, FX_BSTR szName);

+FXJSE_HCLASS	FXJSE_GetClass(FXJSE_HCONTEXT hContext, const CFX_ByteStringC& szName);

 FXJSE_HVALUE	FXJSE_Value_Create(FXJSE_HRUNTIME hRuntime);

 void			FXJSE_Value_Release(FXJSE_HVALUE hValue);

 FXJSE_HRUNTIME	FXJSE_Value_GetRuntime(FXJSE_HVALUE hValue);

@@ -107,7 +107,7 @@ void*		FXJSE_Value_ToObject		(FXJSE_HVALUE hValue, FXJSE_HCLASS hClass);
 void			FXJSE_Value_SetUndefined	(FXJSE_HVALUE hValue);

 void			FXJSE_Value_SetNull			(FXJSE_HVALUE hValue);

 void			FXJSE_Value_SetBoolean		(FXJSE_HVALUE hValue, FX_BOOL	   bBoolean);

-void			FXJSE_Value_SetUTF8String	(FXJSE_HVALUE hValue, FX_BSTR	   szString);

+void			FXJSE_Value_SetUTF8String	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	   szString);

 void			FXJSE_Value_SetInteger		(FXJSE_HVALUE hValue, int32_t     nInteger);

 void			FXJSE_Value_SetFloat		(FXJSE_HVALUE hValue, FX_FLOAT     fFloat);

 void			FXJSE_Value_SetDouble		(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);

@@ -115,17 +115,17 @@ void			FXJSE_Value_SetObject		(FXJSE_HVALUE hValue, void* lpObject, FXJSE_HCLASS
 void			FXJSE_Value_SetArray		(FXJSE_HVALUE hValue, uint32_t uValueCount, FXJSE_HVALUE* rgValues);

 void			FXJSE_Value_SetDate			(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);

 void			FXJSE_Value_Set				(FXJSE_HVALUE hValue, FXJSE_HVALUE hOriginalValue);

-FX_BOOL			FXJSE_Value_GetObjectProp		(FXJSE_HVALUE hValue, FX_BSTR	szPropName,	FXJSE_HVALUE hPropValue);

-FX_BOOL			FXJSE_Value_SetObjectProp		(FXJSE_HVALUE hValue, FX_BSTR	szPropName,	FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_GetObjectProp		(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName,	FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_SetObjectProp		(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName,	FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_GetObjectPropByIdx	(FXJSE_HVALUE hValue, uint32_t	uPropIdx,	FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_SetObjectPropByIdx	(FXJSE_HVALUE hValue, uint32_t	uPropIdx,	FXJSE_HVALUE hPropValue);

-FX_BOOL			FXJSE_Value_DeleteObjectProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName);

-FX_BOOL			FXJSE_Value_ObjectHasOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName, FX_BOOL	bUseTypeGetter);

-FX_BOOL			FXJSE_Value_SetObjectOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName, FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_DeleteObjectProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName);

+FX_BOOL			FXJSE_Value_ObjectHasOwnProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName, FX_BOOL	bUseTypeGetter);

+FX_BOOL			FXJSE_Value_SetObjectOwnProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName, FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_CallFunction		(FXJSE_HVALUE hFunction, FXJSE_HVALUE hThis, FXJSE_HVALUE hRetValue, uint32_t nArgCount, FXJSE_HVALUE* lpArgs);

 FX_BOOL			FXJSE_Value_SetFunctionBind	(FXJSE_HVALUE hValue, FXJSE_HVALUE hOldFunction, FXJSE_HVALUE hNewThis);

 FX_BOOL			FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, const FX_CHAR* szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject = NULL);

-void			FXJSE_ThrowMessage(FX_BSTR utf8Name, FX_BSTR utf8Message);

+void			FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name, const CFX_ByteStringC& utf8Message);

 FX_BOOL			FXJSE_ReturnValue_GetMessage(FXJSE_HVALUE hRetValue, CFX_ByteString& utf8Name, CFX_ByteString& utf8Message);

 FX_BOOL			FXJSE_ReturnValue_GetLineInfo(FXJSE_HVALUE hRetValue, int32_t& nLine, int32_t& nCol);

 #endif