You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
82074ffed1
* 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]
96 lines
2.1 KiB
C++
96 lines
2.1 KiB
C++
// 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()
|
|
{
|
|
// 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.
|
|
switch (Tag)
|
|
{
|
|
case PTYPE_STRING:
|
|
delete StringValue;
|
|
break;
|
|
case PTYPE_STRUCT:
|
|
delete StructValue;
|
|
break;
|
|
case PTYPE_ARRAY:
|
|
delete ArrayValue;
|
|
break;
|
|
case PTYPE_MAP:
|
|
delete MapValue;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
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:
|
|
StructValue = Other.StructValue->Clone();
|
|
break;
|
|
case PTYPE_ARRAY:
|
|
ArrayValue = new TArray<FWebJSParam>(*Other.ArrayValue);
|
|
break;
|
|
case PTYPE_MAP:
|
|
MapValue = new TMap<FString, FWebJSParam>(*Other.MapValue);
|
|
break;
|
|
}
|
|
}
|
|
|
|
void FWebJSFunction::Invoke(int32 ArgCount, FWebJSParam Arguments[]) const
|
|
{
|
|
#if WITH_CEF3
|
|
TSharedPtr<FWebJSScripting> Scripting = ScriptingPtr.Pin();
|
|
if (Scripting.IsValid())
|
|
{
|
|
Scripting->InvokeJSFunction(FunctionId, ArgCount, Arguments);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void FWebJSResponse::Invoke(int32 ArgCount, FWebJSParam Arguments[], bool bIsError) const
|
|
{
|
|
#if WITH_CEF3
|
|
TSharedPtr<FWebJSScripting> Scripting = ScriptingPtr.Pin();
|
|
if (Scripting.IsValid())
|
|
{
|
|
Scripting->InvokeJSFunction(CallbackId, ArgCount, Arguments, bIsError);
|
|
}
|
|
#endif
|
|
} |