mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 83.0.4103.61
This commit is contained in:
@@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/83.0.4103.14',
|
||||
'chromium_checkout': 'refs/tags/83.0.4103.61',
|
||||
'depot_tools_checkout': 'fc5e103221'
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index 023024e81c99..1404e5aff399 100644
|
||||
index b3f8ac152722..89a49bdd1e8a 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
|
||||
index bd8f77e07208..325f4ba698ec 100644
|
||||
index 7a7ba226f6dc..a5c8f844344e 100644
|
||||
--- chrome/browser/profiles/profile_manager.cc
|
||||
+++ chrome/browser/profiles/profile_manager.cc
|
||||
@@ -364,7 +364,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
|
||||
|
@@ -13,7 +13,7 @@ index f90e9fce0675..33551a2874bc 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 25afe1eda95e..78310ebd061d 100644
|
||||
index a8c69a2b1e38..3668a777455e 100644
|
||||
--- content/browser/browser_context.cc
|
||||
+++ content/browser/browser_context.cc
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -33,7 +33,7 @@ index 25afe1eda95e..78310ebd061d 100644
|
||||
in_memory = true;
|
||||
|
||||
return partition_map->Get(partition_domain, partition_name, in_memory,
|
||||
@@ -673,7 +674,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
|
||||
@@ -671,7 +672,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
|
||||
kUseInMemoryDBDefault);
|
||||
|
||||
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
|
||||
|
@@ -122,10 +122,10 @@ index 3e5bf09f1cf7..bc8ea335d501 100644
|
||||
// Set the view's active state (i.e., tint state of controls).
|
||||
virtual void SetActive(bool active) = 0;
|
||||
diff --git ui/base/x/x11_window.cc ui/base/x/x11_window.cc
|
||||
index 62c8122e05ad..ff44d464a7b0 100644
|
||||
index f58ab14a3a07..f8388e7ac048 100644
|
||||
--- ui/base/x/x11_window.cc
|
||||
+++ ui/base/x/x11_window.cc
|
||||
@@ -256,8 +256,12 @@ void XWindow::Init(const Configuration& config) {
|
||||
@@ -255,8 +255,12 @@ void XWindow::Init(const Configuration& config) {
|
||||
attribute_mask |= CWBorderPixel;
|
||||
swa.border_pixel = 0;
|
||||
|
||||
|
@@ -57,7 +57,7 @@ index ab0d55c3de88..360c1b8abdf5 100644
|
||||
}
|
||||
|
||||
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
index 7286135e8f5d..55e17265a36d 100644
|
||||
index 4ee6a0ea5689..8b6d5b1a6e06 100644
|
||||
--- third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
@@ -68,7 +68,7 @@ index 7286135e8f5d..55e17265a36d 100644
|
||||
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
|
||||
#include "third_party/blink/renderer/core/frame/local_frame.h"
|
||||
#include "third_party/blink/renderer/core/inspector/devtools_agent.h"
|
||||
@@ -141,6 +142,7 @@ DevToolsSession::DevToolsSession(
|
||||
@@ -142,6 +143,7 @@ DevToolsSession::DevToolsSession(
|
||||
for (wtf_size_t i = 0; i < agents_.size(); i++)
|
||||
agents_[i]->Restore();
|
||||
}
|
||||
@@ -76,7 +76,7 @@ index 7286135e8f5d..55e17265a36d 100644
|
||||
}
|
||||
|
||||
DevToolsSession::~DevToolsSession() {
|
||||
@@ -181,6 +183,7 @@ void DevToolsSession::Detach() {
|
||||
@@ -182,6 +184,7 @@ void DevToolsSession::Detach() {
|
||||
agents_.clear();
|
||||
v8_session_.reset();
|
||||
agent_->client_->DebuggerTaskFinished();
|
||||
|
Reference in New Issue
Block a user