mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 91.0.4472.0 (#870763)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
index 676c2cc22bac..e6f9642e1cba 100644
|
||||
index 676c2cc22baca..e6f9642e1cba5 100644
|
||||
--- content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
|
||||
@@ -13,34 +13,57 @@ index 676c2cc22bac..e6f9642e1cba 100644
|
||||
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
|
||||
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
|
||||
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
|
||||
index 8b053971dea9..170f5c1b3863 100644
|
||||
index eb88768c1e1c2..2c6c143d4660e 100644
|
||||
--- content/browser/browser_context.cc
|
||||
+++ content/browser/browser_context.cc
|
||||
@@ -235,7 +235,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
|
||||
GetStoragePartitionMap(browser_context);
|
||||
@@ -152,7 +152,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
|
||||
BrowserContext* self,
|
||||
const StoragePartitionConfig& storage_partition_config,
|
||||
bool can_create) {
|
||||
- if (self->IsOffTheRecord()) {
|
||||
+ if (self->IsOffTheRecord() || self->GetPath().empty()) {
|
||||
// An off the record profile MUST only use in memory storage partitions.
|
||||
CHECK(storage_partition_config.in_memory());
|
||||
}
|
||||
@@ -430,7 +430,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
|
||||
const bool kUseInMemoryDBDefault = false;
|
||||
bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
|
||||
media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,
|
||||
- kUseInMemoryDBDefault);
|
||||
+ kUseInMemoryDBDefault) ||
|
||||
+ GetPath().empty();
|
||||
|
||||
auto config_to_use = storage_partition_config;
|
||||
- if (browser_context->IsOffTheRecord())
|
||||
+ if (browser_context->IsOffTheRecord() || browser_context->GetPath().empty())
|
||||
config_to_use = storage_partition_config.CopyWithInMemorySet();
|
||||
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
|
||||
if (use_in_memory_db) {
|
||||
diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc
|
||||
index 9d87aa95e9300..ae82242746e45 100644
|
||||
--- content/public/browser/storage_partition_config.cc
|
||||
+++ content/public/browser/storage_partition_config.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <sstream>
|
||||
|
||||
return partition_map->Get(config_to_use, can_create);
|
||||
@@ -540,7 +540,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
|
||||
kUseInMemoryDBDefault);
|
||||
#include "base/check.h"
|
||||
+#include "base/files/file_path.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "url/gurl.h"
|
||||
@@ -36,7 +37,8 @@ StoragePartitionConfig& StoragePartitionConfig::operator=(
|
||||
// static
|
||||
StoragePartitionConfig StoragePartitionConfig::CreateDefault(
|
||||
BrowserContext* browser_context) {
|
||||
- return StoragePartitionConfig("", "", browser_context->IsOffTheRecord());
|
||||
+ return StoragePartitionConfig("", "", browser_context->IsOffTheRecord() ||
|
||||
+ browser_context->GetPath().empty());
|
||||
}
|
||||
|
||||
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
|
||||
- if (use_in_memory_db) {
|
||||
+ if (use_in_memory_db || GetPath().empty()) {
|
||||
stats_db =
|
||||
std::make_unique<media::InMemoryVideoDecodeStatsDBImpl>(nullptr);
|
||||
} else {
|
||||
// static
|
||||
diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
|
||||
index cb40db947624..807a7c24bc6d 100644
|
||||
index 806e42d494176..1f16adce58383 100644
|
||||
--- storage/browser/database/database_tracker.cc
|
||||
+++ storage/browser/database/database_tracker.cc
|
||||
@@ -495,7 +495,7 @@ bool DatabaseTracker::LazyInit() {
|
||||
databases_table_.reset(new DatabasesTable(db_.get()));
|
||||
meta_table_.reset(new sql::MetaTable());
|
||||
@@ -494,7 +494,7 @@ bool DatabaseTracker::LazyInit() {
|
||||
databases_table_ = std::make_unique<DatabasesTable>(db_.get());
|
||||
meta_table_ = std::make_unique<sql::MetaTable>();
|
||||
|
||||
- is_initialized_ = base::CreateDirectory(db_dir_) &&
|
||||
+ is_initialized_ = (is_incognito_ ? true : base::CreateDirectory(db_dir_)) &&
|
||||
|
Reference in New Issue
Block a user