-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Webkit and it's dependencies to WebKit-6.0
- Loading branch information
Showing
18 changed files
with
137 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...aScriptCore-5.0/JavaScriptCore-5.0.csproj → ...aScriptCore-6.0/JavaScriptCore-6.0.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
src/Libs/WebKit2-5.0/Public/Module.cs → src/Libs/WebKit-6.0/Public/Module.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
namespace WebKit2; | ||
namespace WebKit; | ||
|
||
public class Module | ||
{ | ||
|
2 changes: 1 addition & 1 deletion
2
src/Libs/WebKit2-5.0/Public/UserScript.cs → src/Libs/WebKit-6.0/Public/UserScript.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
using System; | ||
|
||
namespace WebKit2; | ||
namespace WebKit; | ||
|
||
public partial class UserScript | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
|
||
var value = GObject.Internal.ObjectWrapper.WrapHandle<JavaScriptCore.Value>(jsValue, true); | ||
tcs.SetResult(value); | ||
} | ||
|
||
Internal.WebView.EvaluateJavascript( | ||
webView: Handle, | ||
script: GLib.Internal.NonNullableUtf8StringOwnedHandle.Create(script), | ||
length: -1, | ||
worldName: GLib.Internal.NullableUtf8StringOwnedHandle.Create(null), | ||
sourceUri: GLib.Internal.NullableUtf8StringOwnedHandle.Create(null), | ||
cancellable: IntPtr.Zero, | ||
callback: Callback, | ||
userData: IntPtr.Zero | ||
); | ||
|
||
return tcs.Task; | ||
} | ||
} |
8 changes: 4 additions & 4 deletions
8
src/Libs/WebKit2-5.0/WebKit2-5.0.csproj → src/Libs/WebKit-6.0/WebKit-6.0.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/Libs/WebKit2WebExtension-5.0/WebKit2WebExtension-5.0.csproj
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
.../WebKit2WebExtension-5.0/Public/Module.cs → ...tWebProcessExtension-6.0/Public/Module.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
namespace WebKit2WebExtension; | ||
namespace WebKitWebProcessExtension; | ||
|
||
public class Module | ||
{ | ||
|
13 changes: 13 additions & 0 deletions
13
src/Libs/WebKitWebProcessExtension-6.0/WebKitWebProcessExtension-6.0.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
...les/WebKit2-5.0/JavascriptCall/Program.cs → ...ples/WebKit-6.0/JavascriptCall/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.