github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
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(