Skip to content
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.

Sign up for GitHub

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

fix(windows): enable use of custom protocols for all request source kinds when new enough. #1491

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(windows): enable use of custom protocols for all request source kinds when new enough. #1491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
854874f
Enable custom protocols for all Source Kinds
neilmcguire Feb 18, 2025
37e742d
formatting
neilmcguire Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/webview2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,20 @@ impl InnerWebView {
// WebView2 supports non-standard protocols only on Windows 10+, so we have to use this workaround
// See https://github.com/MicrosoftEdge/WebView2Feedback/issues/73
let filter = HSTRING::from(format!("{scheme}://{name}.*"));
webview.AddWebResourceRequestedFilter(&filter, COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL)?;

// If WebView2 version is high enough, use the new API to add the filter to allow Shared Workers and
// iframes to work with custom protocols
// See https://github.com/MicrosoftEdge/WebView2Feedback/issues/1114
if let Ok(webview_22) = webview.cast::<ICoreWebView2_22>() {
webview_22.AddWebResourceRequestedFilterWithRequestSourceKinds(
&filter,
COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL,
COREWEBVIEW2_WEB_RESOURCE_REQUEST_SOURCE_KINDS_ALL,
)?;
} else {
// Fallback to the old API
webview.AddWebResourceRequestedFilter(&filter, COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL)?;
}
}

let env = env.clone();
Expand Down
Loading