Use Clone explicitly instead of MergeDictionary
This commit is contained in:
parent
0abbedcdae
commit
05fcec829e
1 changed files with 2 additions and 3 deletions
|
@ -71,7 +71,7 @@ WebContentsPreferences::WebContentsPreferences(
|
||||||
#endif
|
#endif
|
||||||
SetDefaultBoolIfUndefined("offscreen", false);
|
SetDefaultBoolIfUndefined("offscreen", false);
|
||||||
|
|
||||||
last_dict_.MergeDictionary(&web_preferences_);
|
last_dict_ = std::move(*dict_.CreateDeepCopy());
|
||||||
}
|
}
|
||||||
|
|
||||||
WebContentsPreferences::~WebContentsPreferences() {
|
WebContentsPreferences::~WebContentsPreferences() {
|
||||||
|
@ -256,8 +256,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
|
||||||
// We are appending args to a webContents so let's save the current state
|
// 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
|
// of our preferences object so that during the lifetime of the WebContents
|
||||||
// we can fetch the options used to initally configure the WebContents
|
// we can fetch the options used to initally configure the WebContents
|
||||||
last_dict_.Clear();
|
last_dict_ = std::move(*dict_.CreateDeepCopy());
|
||||||
last_dict_.MergeDictionary(&dict_);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebContentsPreferences::OverrideWebkitPrefs(
|
void WebContentsPreferences::OverrideWebkitPrefs(
|
||||||
|
|
Loading…
Reference in a new issue