izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
56590ceb6077d88b86d07985cddead44dec4982c
UnrealEngineUWP/Engine/Source/Runtime/WebBrowser/Private/WebJSFunction.cpp

85 lines
1.9 KiB
C++
Raw Normal View History

Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
#include "WebBrowserPrivatePCH.h"
#include "WebJSFunction.h"
#include "WebJSScripting.h"
#if WITH_CEF3
#if PLATFORM_WINDOWS
#include "AllowWindowsPlatformTypes.h"
#endif
#pragma push_macro("OVERRIDE")
#undef OVERRIDE // cef headers provide their own OVERRIDE macro
#include "include/cef_values.h"
#pragma pop_macro("OVERRIDE")
#if PLATFORM_WINDOWS
#include "HideWindowsPlatformTypes.h"
#endif
#endif
FWebJSParam::~FWebJSParam()
{
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
// Since the FString, StructWrapper, TArray, and TMap members are in a union, they may or may not be valid, so we have to call the destructors manually.
[INTEGRATE] Fix greedy templated constructor to only apply to non-pointer args. (Allows passing pointer to UObject-derived objects to FWebJSFunction without casting to UObject*) Add support for passing TArray<T> as an argument to a FWebJSFunction. rb: Justin.Sargent Merging CL#2627633 using UE4-To-UE4-LauncherDev [CL 2633907 by Keli Hlodversson in Main branch]
2015-07-27 11:09:14 -04:00
switch (Tag)
Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
{
[INTEGRATE] Fix greedy templated constructor to only apply to non-pointer args. (Allows passing pointer to UObject-derived objects to FWebJSFunction without casting to UObject*) Add support for passing TArray<T> as an argument to a FWebJSFunction. rb: Justin.Sargent Merging CL#2627633 using UE4-To-UE4-LauncherDev [CL 2633907 by Keli Hlodversson in Main branch]
2015-07-27 11:09:14 -04:00
case PTYPE_STRING:
delete StringValue;
break;
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
case PTYPE_STRUCT:
delete StructValue;
break;
[INTEGRATE] Fix greedy templated constructor to only apply to non-pointer args. (Allows passing pointer to UObject-derived objects to FWebJSFunction without casting to UObject*) Add support for passing TArray<T> as an argument to a FWebJSFunction. rb: Justin.Sargent Merging CL#2627633 using UE4-To-UE4-LauncherDev [CL 2633907 by Keli Hlodversson in Main branch]
2015-07-27 11:09:14 -04:00
case PTYPE_ARRAY:
delete ArrayValue;
break;
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
case PTYPE_MAP:
delete MapValue;
break;
[INTEGRATE] Fix greedy templated constructor to only apply to non-pointer args. (Allows passing pointer to UObject-derived objects to FWebJSFunction without casting to UObject*) Add support for passing TArray<T> as an argument to a FWebJSFunction. rb: Justin.Sargent Merging CL#2627633 using UE4-To-UE4-LauncherDev [CL 2633907 by Keli Hlodversson in Main branch]
2015-07-27 11:09:14 -04:00
default:
break;
Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
}
}
FWebJSParam::FWebJSParam(const FWebJSParam& Other)
: Tag(Other.Tag)
{
switch (Other.Tag)
{
case PTYPE_BOOL:
BoolValue = Other.BoolValue;
break;
case PTYPE_DOUBLE:
DoubleValue = Other.DoubleValue;
break;
case PTYPE_INT:
IntValue = Other.IntValue;
break;
case PTYPE_STRING:
StringValue = new FString(*Other.StringValue);
break;
case PTYPE_NULL:
break;
case PTYPE_OBJECT:
ObjectValue = Other.ObjectValue;
break;
case PTYPE_STRUCT:
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
StructValue = Other.StructValue->Clone();
Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
break;
[INTEGRATE] Fix greedy templated constructor to only apply to non-pointer args. (Allows passing pointer to UObject-derived objects to FWebJSFunction without casting to UObject*) Add support for passing TArray<T> as an argument to a FWebJSFunction. rb: Justin.Sargent Merging CL#2627633 using UE4-To-UE4-LauncherDev [CL 2633907 by Keli Hlodversson in Main branch]
2015-07-27 11:09:14 -04:00
case PTYPE_ARRAY:
ArrayValue = new TArray<FWebJSParam>(*Other.ArrayValue);
break;
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
case PTYPE_MAP:
MapValue = new TMap<FString, FWebJSParam>(*Other.MapValue);
break;
Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
}
}
[INTEGRATE] WebBrowser: Extract common functionality from FWebJSFunction and FWebJSResult into a common base class. Added IsValid to check wether the object is valid and bound to a scripting runtime. Merging CL#2645093 using UE4-To-UE4-LauncherDev [CL 2645229 by Keli Hlodversson in Main branch]
2015-08-05 14:14:40 -04:00
void FWebJSCallbackBase::Invoke(int32 ArgCount, FWebJSParam Arguments[], bool bIsError) const
[INTEGRATE] SWebBrowser refactor and cleanups: * Untangle mutual dependencies between objects and constructor order (OPP-3858): * FWebBrowserWindow no longer keeps a reference to FWebBrowserHandler. * CefBrowserWindow is created before creating FWebBrowserWindow and passed to its constructor. * FWebBrowserViewport no longer has a reference back to the viewport widget. * Cleaned how some platform specific paths were defined during module initialization. * Sets current thread name (back) to GameThread after initializing CEF (UE-5165) * Adopted changes from UT (with some modifications): * Enable on-disk caching and persisting cookies when requested by server. * Added product name and engine version to user agent request header. * Ensure UStruct parameters passed by value to FWebJSFunctions are copied when constructing the argument list and not just their address. *SWebBrowser scripting: Add support for passing TMap<FString, T> to FWebJSFunction objects. Note: since the struct serializer does not yet support maps, this only works for arguments passed directly to the function object and not UStruct members nor function return values. OPP-3861 * Add support for passing a reference to the JS promise object implicitly created when calling UFunctions to provide for a way to report runtime errors back to it instead of just passing the return value. * This also allows for implementing async functionality as the promise object can be saved and used after the UFunction has returned. Merging CL#2633955, CL#2634077, CL#2634226, CL#2635540, CL#2636167, and CL#2636262 using UE4-To-UE4-LauncherDev [CL 2636308 by Keli Hlodversson in Main branch]
2015-07-28 18:59:27 -04:00
{
#if WITH_CEF3
TSharedPtr<FWebJSScripting> Scripting = ScriptingPtr.Pin();
if (Scripting.IsValid())
{
Scripting->InvokeJSFunction(CallbackId, ArgCount, Arguments, bIsError);
}
#endif
Merging CL#2601171 using UE4-To-UE4-LauncherDev: Implement JS integration via a subset of UObject scripting functionality and custom CEF Messages JIRA: OPP-3240 rb: Justin.Sargent [CL 2601283 by Keli Hlodversson in Main branch]
2015-06-25 16:56:38 -04:00
}
Reference in New Issue Copy Permalink