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

refactor: only create webContents after 'will-attach-webview' (#32941)

Browse source
This commit is contained in:
Milan Burda 2022-07-21 11:29:31 +02:00 • committed by GitHub
parent 7ae3025fd5
commit d4e97483aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_web_view_manager.cc
View file

@ -28,10 +28,6 @@ void AddGuest(int guest_instance_id,
electron::WebContentsZoomController::FromWebContents(guest_web_contents)
->SetDefaultZoomFactor(zoom_factor);
}
WebContentsPreferences::From(guest_web_contents)->Merge(options);
// Trigger re-calculation of webkit prefs.
guest_web_contents->NotifyPreferencesChanged();
}
void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {

4
shell/browser/web_contents_preferences.cc
View file

@ -176,11 +176,7 @@ 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_);

2
shell/browser/web_contents_preferences.h
View file

@ -40,8 +40,6 @@ class WebContentsPreferences
WebContentsPreferences(const WebContentsPreferences&) = delete;
WebContentsPreferences& operator=(const WebContentsPreferences&) = delete;
void Merge(const gin_helper::Dictionary& new_web_preferences);
void SetFromDictionary(const gin_helper::Dictionary& new_web_preferences);
// Append command parameters according to preferences.