mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 80.0.3987.0 (#722274)
This commit is contained in:
committed by
Marshall Greenblatt
parent
ed39922f85
commit
71768ea6c3
@@ -1,8 +1,8 @@
|
||||
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
index c1bc20a5feab..7969c6e7e991 100644
|
||||
index 5e7af339b157..26bdb73c5086 100644
|
||||
--- content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
|
||||
@@ -118,7 +118,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
|
||||
@@ -116,7 +116,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
|
||||
|
||||
// If we're not incognito mode, schedule all of our file tasks to enable
|
||||
// disk on the storage context.
|
||||
@@ -13,7 +13,7 @@ index c1bc20a5feab..7969c6e7e991 100644
|
||||
{base::ThreadPool(), base::MayBlock(),
|
||||
base::TaskPriority::USER_VISIBLE,
|
||||
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
|
||||
index 99b29aa36717..6ac73053cd36 100644
|
||||
index 7b48f428955b..0bd02ca49d05 100644
|
||||
--- content/browser/browser_context.cc
|
||||
+++ content/browser/browser_context.cc
|
||||
@@ -57,6 +57,7 @@
|
||||
@@ -24,7 +24,7 @@ index 99b29aa36717..6ac73053cd36 100644
|
||||
#include "media/base/media_switches.h"
|
||||
#include "media/capabilities/in_memory_video_decode_stats_db_impl.h"
|
||||
#include "media/capabilities/video_decode_stats_db_impl.h"
|
||||
@@ -165,7 +166,7 @@ StoragePartition* GetStoragePartitionFromConfig(
|
||||
@@ -168,7 +169,7 @@ StoragePartition* GetStoragePartitionFromConfig(
|
||||
StoragePartitionImplMap* partition_map =
|
||||
GetStoragePartitionMap(browser_context);
|
||||
|
||||
@@ -33,7 +33,7 @@ index 99b29aa36717..6ac73053cd36 100644
|
||||
in_memory = true;
|
||||
|
||||
return partition_map->Get(partition_domain, partition_name, in_memory,
|
||||
@@ -719,7 +720,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
|
||||
@@ -665,7 +666,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
|
||||
kUseInMemoryDBDefault);
|
||||
|
||||
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
|
||||
@@ -43,10 +43,10 @@ index 99b29aa36717..6ac73053cd36 100644
|
||||
std::make_unique<media::InMemoryVideoDecodeStatsDBImpl>(nullptr);
|
||||
} else {
|
||||
diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
|
||||
index a0065cac99f0..2d808ea8d33f 100644
|
||||
index 32c4eb76299c..9e86c12802d9 100644
|
||||
--- storage/browser/database/database_tracker.cc
|
||||
+++ storage/browser/database/database_tracker.cc
|
||||
@@ -510,7 +510,7 @@ bool DatabaseTracker::LazyInit() {
|
||||
@@ -511,7 +511,7 @@ bool DatabaseTracker::LazyInit() {
|
||||
meta_table_.reset(new sql::MetaTable());
|
||||
|
||||
is_initialized_ =
|
||||
|
Reference in New Issue
Block a user