Repository navigation
Expose NativeWebView.ProcessTerminated when the web content process is gone #103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
23 changes: 23 additions & 0 deletions
23
src/Avalonia.Controls.WebView.Core/WebKitWebProcessTermination.cs
This file contains hidden or 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,23 @@ | ||
| namespace Avalonia.Controls; | ||
|
|
||
| /// <summary> | ||
| /// Maps <c>WebKitWebProcessTerminationReason</c> values, shared by the WebKitGTK and WPE WebKit ports. | ||
| /// </summary> | ||
| internal static class WebKitWebProcessTermination | ||
| { | ||
| // WebKitWebProcessTerminationReason | ||
| private enum Reason | ||
| { | ||
| Crashed = 0, | ||
| ExceededMemoryLimit = 1, | ||
| TerminatedByApi = 2 | ||
| } | ||
|
|
||
| internal static string GetReasonName(int reason) => reason switch | ||
| { | ||
| (int)Reason.Crashed => "Crashed", | ||
| (int)Reason.ExceededMemoryLimit => "ExceededMemoryLimit", | ||
| (int)Reason.TerminatedByApi => "TerminatedByApi", | ||
| _ => $"Unknown({reason})" | ||
| }; | ||
| } |
This file contains hidden or 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
32 changes: 32 additions & 0 deletions
32
...onia.Controls.WebView.Core/Win/WebView2/Interop/ICoreWebView2ProcessFailedEventHandler.cs
This file contains hidden or 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,32 @@ | ||
| using System.Runtime.InteropServices; | ||
| using System.Runtime.InteropServices.Marshalling; | ||
|
|
||
| namespace Avalonia.Controls.Win.WebView2.Interop; | ||
|
|
||
| internal enum COREWEBVIEW2_PROCESS_FAILED_KIND | ||
| { | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_BROWSER_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_UNRESPONSIVE, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_FRAME_RENDER_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_UTILITY_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_SANDBOX_HELPER_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_GPU_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_PPAPI_PLUGIN_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_PPAPI_BROKER_PROCESS_EXITED, | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND_UNKNOWN_PROCESS_EXITED | ||
| } | ||
|
|
||
| [GeneratedComInterface(Options = ComInterfaceOptions.ComObjectWrapper)] | ||
| [Guid("8155A9A4-1474-4A86-8CAE-151B0FA6B8CA")] | ||
| internal partial interface ICoreWebView2ProcessFailedEventArgs | ||
| { | ||
| COREWEBVIEW2_PROCESS_FAILED_KIND GetProcessFailedKind(); | ||
| } | ||
|
|
||
| [GeneratedComInterface(Options = ComInterfaceOptions.ManagedObjectWrapper)] | ||
| [Guid("79E0AEA4-990B-42D9-AA1D-0FCC2E5BC7F1")] | ||
| internal partial interface ICoreWebView2ProcessFailedEventHandler | ||
| { | ||
| void Invoke([MarshalAs(UnmanagedType.Interface)] ICoreWebView2 sender, [MarshalAs(UnmanagedType.Interface)] ICoreWebView2ProcessFailedEventArgs args); | ||
| } |
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same
web-process-terminatedshould exist in WPE linux backend. Can it be added there too?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wired up in 373ea51. WPE is first in
LinuxDefaultOrder, so without this the event would never fire on the default Linux backend.web-process-terminatedis registered on the shared glibWebKitWebView(Since 2.20), so the WPE adapter now raises the event from the same signal and reuses the shared reason mapping (WebKitWebProcessTermination). The handler follows the existing WPE convention and runs on the UI thread via the GLib pump. No runtime verification here since libWPEWebKit is not installed; the capability interface and mapping are covered by tests.