Skip to content

Commit ff1a36e

Browse files
committed
Renamed CefBrowser to UnityWebBrowser
1 parent 646bde7 commit ff1a36e

File tree

230 files changed

+13
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+13
-6
lines changed

.github/workflows/upload-build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
git clone https://gitlab.com/Voltstro-Studios/WebBrowser/Package.git
33

44
#Detect if there is a change in the package.json files
5-
if(Compare-Object -ReferenceObject $(Get-Content UnityWebBrowserSource/src/CefBrowser/package.json) -DifferenceObject $(Get-Content Package/package.json))
5+
if(Compare-Object -ReferenceObject $(Get-Content UnityWebBrowserSource/src/UnityWebBrowser/package.json) -DifferenceObject $(Get-Content Package/package.json))
66
{
77
Write-Host "Changes in package.json, deploying..."
88

99
#Remove everything excet the git folder to start from a clean state
1010
Remove-Item -Recurse Package/* -Exclude .git
1111

1212
#Lots of copying
13-
Get-ChildItem -Path UnityWebBrowserSource/src/CefBrowser/ | Copy-Item -Destination Package/ -Recurse -Container -Force -PassThru
13+
Get-ChildItem -Path UnityWebBrowserSource/src/UnityWebBrowser/ | Copy-Item -Destination Package/ -Recurse -Container -Force -PassThru
1414

1515
Get-ChildItem -Path Linux-CefBrowserProcess/ | Copy-Item -Destination Package/Plugins/CefBrowser/linux-x64 -Recurse -Container -Force -PassThru
1616
Get-ChildItem -Path Windows-CefBrowserProcess/ | Copy-Item -Destination Package/Plugins/CefBrowser/win-x64 -Recurse -Container -Force -PassThru
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
& "$PSScriptRoot/publish-browserprocess-linux64.ps1"
2-
Copy-Item -Path "../src/CefBrowserProcess/bin/Release/linux-x64/publish/*" -Destination "../src/CefBrowser/Plugins/CefBrowser/linux-x64/" -Recurse -Force -PassThru
2+
Copy-Item -Path "../src/CefBrowserProcess/bin/Release/linux-x64/publish/*" -Destination "../src/UnityWebBrowser/Plugins/CefBrowser/linux-x64/" -Recurse -Force -PassThru
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
& "$PSScriptRoot/publish-browserprocess-win64.ps1"
2-
Copy-Item -Path "../src/CefBrowserProcess/bin/Release/win-x64/publish/*" -Destination "../src/CefBrowser/Plugins/CefBrowser/win-x64/" -Recurse -Force -PassThru
2+
Copy-Item -Path "../src/CefBrowserProcess/bin/Release/win-x64/publish/*" -Destination "../src/UnityWebBrowser/Plugins/CefBrowser/win-x64/" -Recurse -Force -PassThru

src/CefBrowserProcess/CefBrowserProcess.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</ItemGroup>
131131

132132
<ItemGroup>
133-
<Compile Include="..\CefBrowser\Runtime\EventData\*.cs" LinkBase="EventData/" />
133+
<Compile Include="..\UnityWebBrowser\Runtime\EventData\*.cs" LinkBase="EventData/" />
134134
</ItemGroup>
135135

136136
<Import Project="NatvieDefines.targets" />

src/CefBrowserProcess/Core/CefBrowserProcess.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using CefBrowserProcess.Browser;
33
using CefBrowserProcess.Models;
44
using MessagePack;
5+
using MessagePack.Resolvers;
56
using UnityWebBrowser.EventData;
67
using Xilium.CefGlue;
78
using ZeroMQ;
@@ -126,6 +127,12 @@ public CefBrowserProcess(LaunchArguments launchArguments, string[] cefArgs)
126127
Logger.ErrorException(ex, "Something when wrong while creating the CEF client!");
127128
throw new Exception();
128129
}
130+
131+
var options = MessagePackSerializerOptions.Standard.WithResolver(
132+
CompositeResolver.Create(
133+
GeneratedResolver.Instance,
134+
StandardResolver.Instance
135+
));
129136
}
130137

131138
/// <summary>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)