Commit Graph

42 Commits

Author SHA1 Message Date
Wes Fudala
a91d8e1c7f Merging part of CL#2641230 & CL#2641334 LauncherDev->Main
change summary:
- Adding keyboard focus support to webbrowser widget.

[CL 2643366 by Wes Fudala in Main branch]
2015-08-04 09:58:52 -04:00
Dmitry Rekman
acc225081f WebBrowser: Fix compilation on a case-sensitive filesystem.
#codereview Keli.Hlodversson

[CL 2641095 by Dmitry Rekman in Main branch]
2015-07-31 18:02:04 -04:00
Keli Hlodversson
97a2e4a830 [INTEGRATE] SWebBrowser: Add hooks to to be able to handle alert and message boxes with a custom handler
OPP-3413
rb: Justin.Sargent
Merging CL#2637687 using UE4-To-UE4-LauncherDev

[CL 2638717 by Keli Hlodversson in Main branch]
2015-07-30 10:49:18 -04:00
Keli Hlodversson
82074ffed1 [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
Keli Hlodversson
4de1e177cf [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
Keli Hlodversson
c8f9f8fb99 [INTEGRATE] Fix support for overlay-based popup menus. This is required for fullscreen applications where opening a popup window for the menu is not at option.
OPP-3860
rb: Justin.Sargent

Merging CL#2627615  using UE4-To-UE4-LauncherDev.

[CL 2633902 by Keli Hlodversson in Main branch]
2015-07-27 11:06:35 -04:00
Keli Hlodversson
aa41fc4797 [INTEGRATE] Use new serializer predicate functionality to serialize just the return value from the arguments struct.
Reduces amount of required code and adds support to return arrays from UFunctions to JS code.
Merging CL#2624614 using UE4-To-UE4-LauncherDev

[CL 2624975 by Keli Hlodversson in Main branch]
2015-07-17 17:27:52 -04:00
Keli Hlodversson
d8ee60bd2c [INTEGRATE] Merging CL#2615423, CL#2616952, CL#2616995 using UE4-To-UE4-LauncherDev:
Various JS integration fixes and cleanup.

[CL 2618365 by Keli Hlodversson in Main branch]
2015-07-13 12:41:05 -04:00
Keli Hlodversson
e8581b3d86 [INTEGRATE] Merging CL#2613497, CL#2614045, and CL#2614288 using UE4-To-UE4-LauncherDev:
Changes to fix background color issues when opening Chrome Dev Tools from a SBrowserWindow with transparency enabled.

[CL 2618356 by Keli Hlodversson in Main branch]
2015-07-13 12:29:32 -04:00
Keli Hlodversson
d3e3cb1317 [INTEGRATE] Merging CL#2611173 using UE4-To-UE4-LauncherDev
[CL 2618303 by Keli Hlodversson in Main branch]
2015-07-13 11:46:44 -04:00
Justin Sargent
bee4df253d Added a -nocef flag option to the launcher.
Merging using UE4-To-UE4-LauncherDev

rb: Keli

[CL 2616848 by Justin Sargent in Main branch]
2015-07-10 12:44:14 -04:00
Keli Hlodversson
159232bdb2 [INTEGRATE] Merging CL 2608342 and 2608482 using UE4-To-UE4-LauncherDev. Basic support for opening Chrome Dev Tools from debug builds of the WebBrowser widget.
[CL 2611523 by Keli Hlodversson in Main branch]
2015-07-06 15:56:39 -04:00
Wes Fudala
ffba33f8c3 Fixed a number of issues with web browser window spawning and closing.
Merging CL#2608123 LauncherDev->Main
change summary:
- Popup features/settings are now passed to when requesting creation of new browser window.
- Web browser handler now implements DoClose()
- Added support for overriding web browser close functionality.
- Launcher specific test for spawning browser windows with dynamic content.

[CL 2611451 by Wes Fudala in Main branch]
2015-07-06 15:27:08 -04:00
Keli Hlodversson
9f4057814b [INTEGRATE] Merging CL#2606002 using UE4-To-UE4-LauncherDev, which removes support for the CEF MessageRouter mechanism, as the UObject script bindings are more convenient and flexible.
The feature has never been included in an official release, so removing it should not cause a bw compatibility problem.

[CL 2606030 by Keli Hlodversson in Main branch]
2015-06-30 13:19:56 -04:00
Keli Hlodversson
6196c1c941 [INTEGRATE] Merging CL#2605806 using UE4-To-UE4-LauncherDev:
Initialize function parameters before deserializing from JS data.
OPP-3750
rb: Justin.Sargent

[CL 2605882 by Keli Hlodversson in Main branch]
2015-06-30 11:57:46 -04:00
Keli Hlodversson
8d353a5b02 [INTEGRATE] Merging CL#2604183 using UE4-To-UE4-LauncherDev:
Allow using the native mouse cursor handle from CEF.
JIRA: OPP-3734
rb: Justin.Sargent
#platformnotify Josh.Adams

[CL 2605865 by Keli Hlodversson in Main branch]
2015-06-30 11:54:52 -04:00
Keli Hlodversson
5950faf65e Merging CL#2601386 using UE4-To-UE4-LauncherDev:
Fix 32bit compilation errors
rb: Justin.Sargent

[CL 2601398 by Keli Hlodversson in Main branch]
2015-06-25 17:37:15 -04:00
Keli Hlodversson
e2b03ba393 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
Wes Fudala
22c9856fe5 [OPP-3051] Add support for multiple browser windows.
Merging CL#2582871 LauncherDev->Main
change summary:
- Web browser modified to allow users to pass in a callback function that will handle window creation.

[CL 2586148 by Wes Fudala in Main branch]
2015-06-12 14:55:16 -04:00
Justin Sargent
273cde1704 Merging using UE4-To-UE4-LauncherDev
#platformnotify Josh.Adams

[CL 2581810 by Justin Sargent in Main branch]
2015-06-09 16:41:53 -04:00
Peter Knepley
8642e28883 Integrate UT webbrowser changes
#codereview Matthew.Griffin

[CL 2563130 by Peter Knepley in Main branch]
2015-05-22 15:17:48 -04:00
Wes Fudala
0a11b4f033 [OPP-3051] Remove size clamp imposed on the web browser windows.
Merging CL#2507537 LauncherDev->Main

[CL 2536187 by Wes Fudala in Main branch]
2015-05-04 15:21:04 -04:00
Justin Sargent
16faf3fb18 Adjusted the SWebBrowser's padding for it's internal navigation bar and controls. When these controls are hidden it will no longer pad the viewport 10 pixels from the top.
Merging using UE4-To-UE4-LauncherDev

rb: Keli

[CL 2534158 by Justin Sargent in Main branch]
2015-05-01 15:52:04 -04:00
Matthew Griffin
315259b0d1 Fixed issues with merge of WebBrowser code from Launcher branch
#codereview Carlos.Cuello, Keli.Hlodversson

[CL 2510109 by Matthew Griffin in Main branch]
2015-04-13 06:16:41 -04:00
Marc Audy
4562acb429 Fix shadow variables
[CL 2507160 by Marc Audy in Main branch]
2015-04-09 15:23:52 -04:00