mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "refactor: only create webContents after 'will-attach-webview' (#30311)" (#31785)

Browse source 
This reverts commit 6e43b0bcbf.
This commit is contained in:
Charles Kerr 2021-11-11 14:04:06 -06:00 • committed by GitHub
parent 09d160f406
commit cac871c027
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 80 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/web_contents_preferences.cc
View file

@ -176,7 +176,11 @@ void WebContentsPreferences::Clear() {
void WebContentsPreferences::SetFromDictionary(
const gin_helper::Dictionary& web_preferences) {
Clear();
Merge(web_preferences);
}
void WebContentsPreferences::Merge(
const gin_helper::Dictionary& web_preferences) {
web_preferences.Get(options::kPlugins, &plugins_);
web_preferences.Get(options::kExperimentalFeatures, &experimental_features_);
web_preferences.Get(options::kNodeIntegration, &node_integration_);