refactor: only create webContents after 'will-attach-webview' (#30311)
This commit is contained in:
parent
4519bc3cd1
commit
6e43b0bcbf
9 changed files with 17 additions and 80 deletions
|
@ -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) {
|
||||
|
|
|
@ -174,11 +174,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_);
|
||||
|
|
|
@ -36,8 +36,6 @@ class WebContentsPreferences
|
|||
const gin_helper::Dictionary& web_preferences);
|
||||
~WebContentsPreferences() override;
|
||||
|
||||
void Merge(const gin_helper::Dictionary& new_web_preferences);
|
||||
|
||||
void SetFromDictionary(const gin_helper::Dictionary& new_web_preferences);
|
||||
|
||||
// Append command paramters according to preferences.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue