bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 105.0.5176.0 (#1023155)

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-07-21 13:26:10 -04:00
parent 5e753d211f
commit e9f29ab3d6
92 changed files with 615 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libcef/browser/extensions/value_store/cef_value_store.cc
View File

@@ -60,11 +60,11 @@ ValueStore::ReadResult CefValueStore::Get(
if (!status_.ok())
return ReadResult(CreateStatusCopy(status_));
auto settings = std::make_unique<base::DictionaryValue>();
base::Value::Dict settings;
for (const auto& key : keys) {
base::Value* value = storage_.FindKey(key);
base::Value* value = storage_.Find(key);
if (value) {
settings->SetKey(key, value->Clone());
settings.Set(key, value->Clone());
}
}
return ReadResult(std::move(settings), CreateStatusCopy(status_));
@@ -74,35 +74,33 @@ ValueStore::ReadResult CefValueStore::Get() {
read_count_++;
if (!status_.ok())
return ReadResult(CreateStatusCopy(status_));
return ReadResult(storage_.CreateDeepCopy(), CreateStatusCopy(status_));
return ReadResult(storage_.Clone(), CreateStatusCopy(status_));
}
ValueStore::WriteResult CefValueStore::Set(WriteOptions options,
const std::string& key,
const base::Value& value) {
base::DictionaryValue settings;
settings.SetKey(key, value.Clone());
base::Value::Dict settings;
settings.Set(key, value.Clone());
return Set(options, settings);
}
ValueStore::WriteResult CefValueStore::Set(
WriteOptions options,
const base::DictionaryValue& settings) {
ValueStore::WriteResult CefValueStore::Set(WriteOptions options,
const base::Value::Dict& settings) {
write_count_++;
if (!status_.ok())
return WriteResult(CreateStatusCopy(status_));
ValueStoreChangeList changes;
for (base::DictionaryValue::Iterator it(settings); !it.IsAtEnd();
it.Advance()) {
base::Value* old_value = storage_.FindKey(it.key());
if (!old_value || *old_value != it.value()) {
changes.emplace_back(it.key(),
for (const auto [key, value] : settings) {
base::Value* old_value = storage_.Find(key);
if (!old_value || *old_value != value) {
changes.emplace_back(key,
old_value
? absl::optional<base::Value>(old_value->Clone())
: absl::nullopt,
it.value().Clone());
storage_.SetKey(it.key(), it.value().Clone());
value.Clone());
storage_.Set(key, value.Clone());
}
}
return WriteResult(std::move(changes), CreateStatusCopy(status_));
@@ -120,7 +118,7 @@ ValueStore::WriteResult CefValueStore::Remove(
ValueStoreChangeList changes;
for (auto const& key : keys) {
absl::optional<base::Value> old_value = storage_.ExtractKey(key);
absl::optional<base::Value> old_value = storage_.Extract(key);
if (old_value.has_value()) {
changes.emplace_back(key, std::move(*old_value), absl::nullopt);
}
@@ -130,9 +128,8 @@ ValueStore::WriteResult CefValueStore::Remove(
ValueStore::WriteResult CefValueStore::Clear() {
std::vector<std::string> keys;
for (base::DictionaryValue::Iterator it(storage_); !it.IsAtEnd();
it.Advance()) {
keys.push_back(it.key());
for (const auto [key, value] : storage_) {
keys.push_back(key);
}
return Remove(keys);
}

4
libcef/browser/extensions/value_store/cef_value_store.h
View File

@@ -48,13 +48,13 @@ class CefValueStore : public ValueStore {
const std::string& key,
const base::Value& value) override;
WriteResult Set(WriteOptions options,
const base::DictionaryValue& values) override;
const base::Value::Dict& values) override;
WriteResult Remove(const std::string& key) override;
WriteResult Remove(const std::vector<std::string>& keys) override;
WriteResult Clear() override;
private:
base::DictionaryValue storage_;
base::Value::Dict storage_;
int read_count_ = 0;
int write_count_ = 0;
ValueStore::Status status_;