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
777dffe8ff8d52d7eb7894deab386c816a48f80f
UnrealEngineUWP/Engine/Source/Runtime/WebBrowser/Private/WebJSFunction.cpp

88 lines
2.0 KiB
C++
Raw Normal View History

Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017). #rb none #lockdown Nick.Penwarden [CL 3226823 by Ben Marsh in Main branch]
2016-12-08 08:52:44 -05:00
// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
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
#include "WebJSFunction.h"
#include "WebJSScripting.h"
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#if WITH_CEF3
#if PLATFORM_WINDOWS
#include "WindowsHWrapper.h"
#include "AllowWindowsPlatformTypes.h"
#include "AllowWindowsPlatformAtomics.h"
#endif
#pragma push_macro("OVERRIDE")
#undef OVERRIDE // cef headers provide their own OVERRIDE macro
Fix UE4Game XboxOne compile errors, and UE4Editor Win64 static analysis warnings in non-unity. #rb none #lockdown Nick.Penwarden [CL 3210607 by Ben Marsh in Main branch]
2016-11-27 17:51:22 -05:00
THIRD_PARTY_INCLUDES_START
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#include "include/cef_values.h"
Fix UE4Game XboxOne compile errors, and UE4Editor Win64 static analysis warnings in non-unity. #rb none #lockdown Nick.Penwarden [CL 3210607 by Ben Marsh in Main branch]
2016-11-27 17:51:22 -05:00
THIRD_PARTY_INCLUDES_END
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#pragma pop_macro("OVERRIDE")
#if PLATFORM_WINDOWS
#include "HideWindowsPlatformAtomics.h"
#include "HideWindowsPlatformTypes.h"
#endif
#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
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
{
TSharedPtr<FWebJSScripting> Scripting = ScriptingPtr.Pin();
if (Scripting.IsValid())
{
Scripting->InvokeJSFunction(CallbackId, ArgCount, Arguments, bIsError);
}
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //UE4/Portal-Staging @ 3138637) #lockdown Nick.Penwarden, justin.sargent #rb None [CL 3138769 by Alex Fennell in Main branch]
2016-09-23 17:31:51 -04:00
}
Reference in New Issue Copy Permalink