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

Use Clone explicitly instead of MergeDictionary

Browse source
This commit is contained in:
Cheng Zhao 2018-03-22 15:29:20 +09:00
parent 0abbedcdae
commit 05fcec829e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/web_contents_preferences.cc
View file

@ -71,7 +71,7 @@ WebContentsPreferences::WebContentsPreferences(
#endif
SetDefaultBoolIfUndefined("offscreen", false);
last_dict_.MergeDictionary(&web_preferences_);
last_dict_ = std::move(*dict_.CreateDeepCopy());
}
WebContentsPreferences::~WebContentsPreferences() {
@ -256,8 +256,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
// We are appending args to a webContents so let's save the current state
// of our preferences object so that during the lifetime of the WebContents
// we can fetch the options used to initally configure the WebContents
last_dict_.Clear();
last_dict_.MergeDictionary(&dict_);
last_dict_ = std::move(*dict_.CreateDeepCopy());
}
void WebContentsPreferences::OverrideWebkitPrefs(