Skip to content

Commit

Permalink
Update Webkit and it's dependencies to WebKit-6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
badcel committed Jul 18, 2023
1 parent b6c2d96 commit ac7c548
Show file tree
Hide file tree
Showing 18 changed files with 137 additions and 149 deletions.
6 changes: 3 additions & 3 deletions src/GenerateLibs.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ let girFiles =
"Gtk-4.0.gir"
"GtkSource-5.gir"
"HarfBuzz-0.0.gir"
"JavaScriptCore-5.0.gir"
"JavaScriptCore-6.0.gir"
"Pango-1.0.gir"
"PangoCairo-1.0.gir"
"Soup-3.0.gir"
"WebKit2-5.0.gir"
"WebKit2WebExtension-5.0.gir"
"WebKit-6.0.gir"
"WebKitWebProcessExtension-6.0.gir"
|]
|> Array.append extraFiles
|> String.concat " "
Expand Down
96 changes: 48 additions & 48 deletions src/GirCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Window", "Samples\Adw-1\Win
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "freetype2-2.0", "Libs\freetype2-2.0\freetype2-2.0.csproj", "{29C4FE32-0609-45EE-9C16-E4E50CA66B81}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebKit2-5.0", "Libs\WebKit2-5.0\WebKit2-5.0.csproj", "{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptCore-6.0", "Libs\JavaScriptCore-6.0\JavaScriptCore-6.0.csproj", "{BD15BF89-69FB-494F-890C-7FB9767C4E4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptCore-5.0", "Libs\JavaScriptCore-5.0\JavaScriptCore-5.0.csproj", "{BD15BF89-69FB-494F-890C-7FB9767C4E4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebKit2WebExtension-5.0", "Libs\WebKit2WebExtension-5.0\WebKit2WebExtension-5.0.csproj", "{FA8F1775-0D58-4727-A168-6111773A43A3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebKitWebProcessExtension-6.0", "Libs\WebKitWebProcessExtension-6.0\WebKitWebProcessExtension-6.0.csproj", "{FA8F1775-0D58-4727-A168-6111773A43A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Soup-3.0", "Libs\Soup-3.0\Soup-3.0.csproj", "{A464F066-1DA1-4A3C-B79E-2AA4B116D49E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit2-5.0", "WebKit2-5.0", "{825BF602-98A7-45E7-A2C9-9E68160B7DF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavascriptCall", "Samples\WebKit2-5.0\JavascriptCall\JavascriptCall.csproj", "{9670582B-4E32-48AA-B62B-DA659E6AB4A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavascriptCallback", "Samples\WebKit2-5.0\JavascriptCallback\JavascriptCallback.csproj", "{1AF16CCD-2220-4F60-A68F-622F186BEA8F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit-6.0", "WebKit-6.0", "{825BF602-98A7-45E7-A2C9-9E68160B7DF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GirTest-0.1", "Libs\GirTest-0.1\GirTest-0.1.csproj", "{BF0E85F5-34EC-49BB-8221-517B839B6550}"
EndProject
Expand All @@ -210,6 +204,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GtkSource-5", "GtkSource-5"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GtkSourceView", "Samples\GtkSource-5\GtkSourceView\GtkSourceView.csproj", "{C2F46D6C-B890-4316-8090-BB7AA7B8BFD6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebKit-6.0", "Libs\WebKit-6.0\WebKit-6.0.csproj", "{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavascriptCall", "Samples\WebKit-6.0\JavascriptCall\JavascriptCall.csproj", "{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavascriptCallback", "Samples\WebKit-6.0\JavascriptCallback\JavascriptCallback.csproj", "{9CF39E8D-5543-47E9-A136-A85009FF12C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -727,18 +727,6 @@ Global
{29C4FE32-0609-45EE-9C16-E4E50CA66B81}.Release|x64.Build.0 = Release|Any CPU
{29C4FE32-0609-45EE-9C16-E4E50CA66B81}.Release|x86.ActiveCfg = Release|Any CPU
{29C4FE32-0609-45EE-9C16-E4E50CA66B81}.Release|x86.Build.0 = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|x64.ActiveCfg = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|x64.Build.0 = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|x86.ActiveCfg = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Debug|x86.Build.0 = Debug|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|Any CPU.Build.0 = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|x64.ActiveCfg = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|x64.Build.0 = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|x86.ActiveCfg = Release|Any CPU
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3}.Release|x86.Build.0 = Release|Any CPU
{BD15BF89-69FB-494F-890C-7FB9767C4E4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD15BF89-69FB-494F-890C-7FB9767C4E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD15BF89-69FB-494F-890C-7FB9767C4E4B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -775,30 +763,6 @@ Global
{A464F066-1DA1-4A3C-B79E-2AA4B116D49E}.Release|x64.Build.0 = Release|Any CPU
{A464F066-1DA1-4A3C-B79E-2AA4B116D49E}.Release|x86.ActiveCfg = Release|Any CPU
{A464F066-1DA1-4A3C-B79E-2AA4B116D49E}.Release|x86.Build.0 = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|x64.ActiveCfg = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|x64.Build.0 = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|x86.ActiveCfg = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Debug|x86.Build.0 = Debug|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|Any CPU.Build.0 = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|x64.ActiveCfg = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|x64.Build.0 = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|x86.ActiveCfg = Release|Any CPU
{9670582B-4E32-48AA-B62B-DA659E6AB4A1}.Release|x86.Build.0 = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|x64.ActiveCfg = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|x64.Build.0 = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|x86.ActiveCfg = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Debug|x86.Build.0 = Debug|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|Any CPU.Build.0 = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|x64.ActiveCfg = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|x64.Build.0 = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|x86.ActiveCfg = Release|Any CPU
{1AF16CCD-2220-4F60-A68F-622F186BEA8F}.Release|x86.Build.0 = Release|Any CPU
{BF0E85F5-34EC-49BB-8221-517B839B6550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF0E85F5-34EC-49BB-8221-517B839B6550}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF0E85F5-34EC-49BB-8221-517B839B6550}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -847,6 +811,42 @@ Global
{C2F46D6C-B890-4316-8090-BB7AA7B8BFD6}.Release|x64.Build.0 = Release|Any CPU
{C2F46D6C-B890-4316-8090-BB7AA7B8BFD6}.Release|x86.ActiveCfg = Release|Any CPU
{C2F46D6C-B890-4316-8090-BB7AA7B8BFD6}.Release|x86.Build.0 = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|x64.ActiveCfg = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|x64.Build.0 = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|x86.ActiveCfg = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Debug|x86.Build.0 = Debug|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|Any CPU.Build.0 = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|x64.ActiveCfg = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|x64.Build.0 = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|x86.ActiveCfg = Release|Any CPU
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8}.Release|x86.Build.0 = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|x64.ActiveCfg = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|x64.Build.0 = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|x86.ActiveCfg = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Debug|x86.Build.0 = Debug|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|Any CPU.Build.0 = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|x64.ActiveCfg = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|x64.Build.0 = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|x86.ActiveCfg = Release|Any CPU
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B}.Release|x86.Build.0 = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|x64.ActiveCfg = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|x64.Build.0 = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|x86.ActiveCfg = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Debug|x86.Build.0 = Debug|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|Any CPU.Build.0 = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x64.ActiveCfg = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x64.Build.0 = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x86.ActiveCfg = Release|Any CPU
{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BF7F9B0B-CB43-4161-BFAD-C6EE479FC86B} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
Expand Down Expand Up @@ -902,18 +902,18 @@ Global
{98F22FA8-3E06-47D0-9516-64BDF61407D6} = {1F2E4087-585C-4B48-8E3D-700D949A15DB}
{3647E5F6-E194-4CAD-B387-948CD90FD5DC} = {98F22FA8-3E06-47D0-9516-64BDF61407D6}
{29C4FE32-0609-45EE-9C16-E4E50CA66B81} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{E9CC2642-BCA7-4BF6-9AE4-3B03C3A56FB3} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{BD15BF89-69FB-494F-890C-7FB9767C4E4B} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{FA8F1775-0D58-4727-A168-6111773A43A3} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{A464F066-1DA1-4A3C-B79E-2AA4B116D49E} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{825BF602-98A7-45E7-A2C9-9E68160B7DF3} = {1F2E4087-585C-4B48-8E3D-700D949A15DB}
{9670582B-4E32-48AA-B62B-DA659E6AB4A1} = {825BF602-98A7-45E7-A2C9-9E68160B7DF3}
{1AF16CCD-2220-4F60-A68F-622F186BEA8F} = {825BF602-98A7-45E7-A2C9-9E68160B7DF3}
{BF0E85F5-34EC-49BB-8221-517B839B6550} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{6D09E811-20BF-48A0-BFCD-A2A0B357C8BD} = {46D66262-FC61-43B9-8E76-A361FA3D6C81}
{15AC3143-9682-4F78-9A9C-3C4D32A9A48C} = {0D9C5C7E-F81B-4E0E-B203-22D558E6D7F1}
{9D19B388-AD8B-4DC5-B351-5D9FCEAE8FEA} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{9520EBB9-2A53-4046-8749-83BC633EA731} = {1F2E4087-585C-4B48-8E3D-700D949A15DB}
{C2F46D6C-B890-4316-8090-BB7AA7B8BFD6} = {9520EBB9-2A53-4046-8749-83BC633EA731}
{1E2FA4E9-75B8-4410-B3D7-15A5AF2FC5C8} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
{1751A21D-3D4D-4668-A95A-B6969D3ACE0B} = {825BF602-98A7-45E7-A2C9-9E68160B7DF3}
{9CF39E8D-5543-47E9-A136-A85009FF12C3} = {825BF602-98A7-45E7-A2C9-9E68160B7DF3}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion src/Libs/Gio-2.0/Public/DBusConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public Task<Variant> CallAsync(string busName, string objectPath, string interfa
{
var tcs = new TaskCompletionSource<Variant>();

void Callback(GObject.Object sourceObject, AsyncResult res)
void Callback(GObject.Object sourceObject, AsyncResult res, IntPtr data)
{
// TODO: Make sure this is correct (can we assume res is a GObject?)
var ret = Internal.DBusConnection.CallFinish(sourceObject.Handle, (res as GObject.Object).Handle, out var error);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>GirCore.JavaScriptCore-5.0</PackageId>
<PackageId>GirCore.JavaScriptCore-6.0</PackageId>
<RootNamespace>JavaScriptCore</RootNamespace>
<Description>C# bindings for JavaScriptCore.</Description>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace WebKit2;
namespace WebKit;

public class Module
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace WebKit2;
namespace WebKit;

public partial class UserScript
{
Expand Down
35 changes: 35 additions & 0 deletions src/Libs/WebKit-6.0/Public/WebView.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using System;
using System.Threading.Tasks;

namespace WebKit;

public partial class WebView
{
//TODO: Async methods should be generated automatically (https://github.com/gircore/gir.core/issues/893)
public Task<JavaScriptCore.Value> EvaluateJavascriptAsync(string script)
{
var tcs = new TaskCompletionSource<JavaScriptCore.Value>();

void Callback(IntPtr sourceObject, IntPtr res, IntPtr userData)
{
var jsValue = Internal.WebView.EvaluateJavascriptFinish(sourceObject, res, out var error);
GLib.Error.ThrowOnError(error);

Check warning on line 17 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
var value = GObject.Internal.ObjectWrapper.WrapHandle<JavaScriptCore.Value>(jsValue, true);
tcs.SetResult(value);
}

Internal.WebView.EvaluateJavascript(
webView: Handle,

Check warning on line 23 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
script: GLib.Internal.NonNullableUtf8StringOwnedHandle.Create(script),

Check warning on line 24 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
length: -1,

Check warning on line 25 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
worldName: GLib.Internal.NullableUtf8StringOwnedHandle.Create(null),

Check warning on line 26 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
sourceUri: GLib.Internal.NullableUtf8StringOwnedHandle.Create(null),
cancellable: IntPtr.Zero,

Check warning on line 28 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
callback: Callback,

Check warning on line 29 in src/Libs/WebKit-6.0/Public/WebView.cs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest)

Fix formatting
userData: IntPtr.Zero
);

return tcs.Task;
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>GirCore.WebKit2-5.0</PackageId>
<RootNamespace>WebKit2</RootNamespace>
<Description>C# bindings for WebKit2.</Description>
<PackageId>GirCore.WebKit-6.0</PackageId>
<RootNamespace>WebKit</RootNamespace>
<Description>C# bindings for WebKit.</Description>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Gtk-4.0\Gtk-4.0.csproj" />
<ProjectReference Include="..\JavaScriptCore-5.0\JavaScriptCore-5.0.csproj" />
<ProjectReference Include="..\JavaScriptCore-6.0\JavaScriptCore-6.0.csproj" />
<ProjectReference Include="..\Soup-3.0\Soup-3.0.csproj" />
</ItemGroup>
</Project>
27 changes: 0 additions & 27 deletions src/Libs/WebKit2-5.0/Public/UserContentManager.cs

This file was deleted.

27 changes: 0 additions & 27 deletions src/Libs/WebKit2-5.0/Public/WebView.cs

This file was deleted.

13 changes: 0 additions & 13 deletions src/Libs/WebKit2WebExtension-5.0/WebKit2WebExtension-5.0.csproj

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace WebKit2WebExtension;
namespace WebKitWebProcessExtension;

public class Module
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Gtk-4.0\Gtk-4.0.csproj" />
<ProjectReference Include="..\JavaScriptCore-6.0\JavaScriptCore-6.0.csproj" />
<ProjectReference Include="..\Soup-3.0\Soup-3.0.csproj" />
</ItemGroup>

<PropertyGroup>
<PackageId>GirCore.WebKitWebProcessExtension-6.0</PackageId>
<RootNamespace>WebKitWebProcessExtension</RootNamespace>
<Description>C# bindings for WebKitWebProcessExtension.</Description>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Libs\Gtk-4.0\Gtk-4.0.csproj" />
<ProjectReference Include="..\..\..\Libs\WebKit2-5.0\WebKit2-5.0.csproj" />
<ProjectReference Include="..\..\..\Libs\WebKit-6.0\WebKit-6.0.csproj" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
#pragma warning disable CA1416

WebKit2.Module.Initialize();
WebKit.Module.Initialize();

var application = Gtk.Application.New("org.gir.core", Gio.ApplicationFlags.FlagsNone);
application.OnActivate += (sender, _) =>
{
var webView = WebKit2.WebView.New();
var webView = WebKit.WebView.New();
webView.HeightRequest = 500;
webView.WidthRequest = 500;
var ucm = webView.GetUserContentManager();
ucm.AddScript(WebKit2.UserScript.New(
ucm.AddScript(WebKit.UserScript.New(
source: "function testFunc() { return 'Success' }",
injectedFrames: WebKit2.UserContentInjectedFrames.AllFrames,
injectionTime: WebKit2.UserScriptInjectionTime.End)
injectedFrames: WebKit.UserContentInjectedFrames.AllFrames,
injectionTime: WebKit.UserScriptInjectionTime.End)
);
webView.OnLoadChanged += async (view, signalArgs) =>
{
if (signalArgs.LoadEvent != WebKit2.LoadEvent.Finished)
if (signalArgs.LoadEvent != WebKit.LoadEvent.Finished)
return;
var result = await webView.RunJavascriptAsync("testFunc()");
var result = await webView.EvaluateJavascriptAsync("testFunc();");
System.Console.WriteLine(result.ToString()); //Writes "Success" into the console
};
Expand Down
Loading

0 comments on commit ac7c548

Please sign in to comment.