- Notifications
You must be signed in to change notification settings - Fork 9
Experimental features tab#91
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
cb49a91
Some progress on Experimental
952a316
Finish the Experimental tab feature
oggy22 6911c1a
Resolving most comments from Dave
420c0a6
Revert MainWindow.xaml around RuntimeList
oggy22 d0070a7
Remove extra list
oggy22 1839ff8
Reload overrides tab when toggling the self-hosting option
oggy22 af40bcc
Remove list variable
177e856
"Preview WebView2 Runtime"
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.ObjectModel; | ||
| using System.Linq; | ||
| using System.Windows; | ||
| namespace wv2util | ||
| { | ||
| public class ExperimentalFeature : IEquatable<ExperimentalFeature>, IComparable<ExperimentalFeature> | ||
| { | ||
| public string Name { get; set; } | ||
| private bool m_IsEnabled; | ||
| public bool IsEnabled | ||
| { | ||
| get { return m_IsEnabled; } | ||
| set | ||
| { | ||
| if (value) | ||
| { | ||
| m_IsEnabled = m_turnOn(); | ||
| return; | ||
| } | ||
| else | ||
| { | ||
| m_turnOff(); | ||
| } | ||
| m_IsEnabled = value; | ||
| } | ||
| } | ||
| public string Description { get; set; } | ||
| private Func<bool> m_turnOn; | ||
| private Action m_turnOff; | ||
| public ExperimentalFeature(Func<bool> turnOn, Action turnOff, Func<bool> isOn) | ||
| { | ||
| this.m_turnOn = turnOn; | ||
| this.m_turnOff = turnOff; | ||
| m_IsEnabled = isOn(); | ||
| } | ||
| public int CompareTo(ExperimentalFeature other) | ||
| { | ||
| return Name.CompareTo(other.Name); | ||
| } | ||
| public bool Equals(ExperimentalFeature other) | ||
| { | ||
| return Name.Equals(other.Name); | ||
| } | ||
| } | ||
| public class EnvVarExperimentalFeature : ExperimentalFeature | ||
| { | ||
| public EnvVarExperimentalFeature(string envVar, string onVal, string offVal) : base( | ||
| () => | ||
| { | ||
| // Turn on: | ||
| Environment.SetEnvironmentVariable(envVar, onVal, EnvironmentVariableTarget.User); | ||
| return true; | ||
| }, | ||
| () => | ||
| { | ||
| // Turn off: | ||
| Environment.SetEnvironmentVariable(envVar, offVal, EnvironmentVariableTarget.User); | ||
| Environment.SetEnvironmentVariable(envVar, offVal, EnvironmentVariableTarget.Machine); | ||
| }, | ||
| () => | ||
| { | ||
| string val = Environment.GetEnvironmentVariable(envVar, EnvironmentVariableTarget.User); | ||
| return val != null && val == onVal; | ||
| }) | ||
| { | ||
| } | ||
| } | ||
| public class ExperimentalFeatureList : ObservableCollection<ExperimentalFeature> | ||
| { | ||
| public ExperimentalFeatureList() | ||
| { | ||
| // Canary self-hosting | ||
| Items.Add(new ExperimentalFeature( | ||
| () => | ||
| { | ||
| var runtimes = AppState.GetRuntimeList(); | ||
| // Only if Canary is installed turn self-hosting on | ||
| if (runtimes.Any(runtime => runtime.Channel == "Canary")) | ||
| { | ||
| Environment.SetEnvironmentVariable("WEBVIEW2_RELEASE_CHANNEL_PREFERENCE", "1", EnvironmentVariableTarget.User); | ||
| AppState.GetAppOverrideList().FromSystem(); | ||
| return true; | ||
| } | ||
| const string canaryLink = "https://go.microsoft.com/fwlink/?linkid=2084649&Channel=Canary&language=en"; | ||
| if (MessageBox.Show( | ||
| $"Before turning on this feature you need to have Canary installed from {canaryLink}. Do you want to install it now?", | ||
| "Canary missing", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) | ||
| { | ||
| System.Diagnostics.Process.Start(canaryLink); | ||
| } | ||
| return false; | ||
| }, | ||
| () => | ||
| { | ||
| // Turn off: | ||
| Environment.SetEnvironmentVariable("WEBVIEW2_RELEASE_CHANNEL_PREFERENCE", null, EnvironmentVariableTarget.User); | ||
| AppState.GetAppOverrideList().FromSystem(); | ||
| }, | ||
| () => | ||
| { | ||
| string val = Environment.GetEnvironmentVariable("WEBVIEW2_RELEASE_CHANNEL_PREFERENCE", EnvironmentVariableTarget.User); | ||
| return val != null && val == "1"; | ||
| } | ||
| ) | ||
| { | ||
| Name = "Preview WebView2 Runtime", | ||
| Description = "Host apps use canary WebView2 runtime if installed instead of stable." | ||
| }); | ||
| // Visual Hosting | ||
| Items.Add(new EnvVarExperimentalFeature( | ||
| "COREWEBVIEW2_FORCED_HOSTING_MODE", | ||
| "COREWEBVIEW2_HOSTING_MODE_WINDOW_TO_VISUAL", | ||
| null) | ||
| { | ||
| Name = "Visual hosting", | ||
| Description = "Host apps use visual hosting instead of regular window hosting." | ||
| }); | ||
| // To add more experimental features to the runtimes either: | ||
| // add EnvVarExperimentalFeature if the feature is controlled only by an enviroment variable | ||
| // OR | ||
| // add ExperimentalFeature with on, off and check delegates if the feature requires more specific operations | ||
| } | ||
| } | ||
| } | ||
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
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.
Why use the environment variable to set this override versus a registry key?
Pros:
Cons:
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.
changes to the environment variables won't apply to processes that have already started, unlike changes to the registry.
If the process already started, nothing can change its runtime regardless of the method we choose to change this, right?
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.
I mean if the host app creates another webview2. The next webview2 created will respect the updated regkey but the updated env var isn't applied to the already running host app process.
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.
I understand that, I just thought that's an unlikely scenario, but I guess it can still happen.