mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 84.0.4147.89
This commit is contained in:
@@ -7,5 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/84.0.4147.38'
|
'chromium_checkout': 'refs/tags/84.0.4147.89',
|
||||||
|
'depot_tools_checkout': '233589f2e7'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 5f82bb3beaf7..7183b9dc8005 100644
|
index ab78eae16b47..e0d841bee4a3 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/crypto.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/crypto.gni")
|
||||||
@@ -10,7 +10,7 @@ index 5f82bb3beaf7..7183b9dc8005 100644
|
|||||||
import("//chrome/browser/buildflags.gni")
|
import("//chrome/browser/buildflags.gni")
|
||||||
import("//chrome/browser/downgrade/buildflags.gni")
|
import("//chrome/browser/downgrade/buildflags.gni")
|
||||||
import("//chrome/common/features.gni")
|
import("//chrome/common/features.gni")
|
||||||
@@ -1977,6 +1978,7 @@ static_library("browser") {
|
@@ -1967,6 +1968,7 @@ static_library("browser") {
|
||||||
"//base/util/values:values_util",
|
"//base/util/values:values_util",
|
||||||
"//build:branding_buildflags",
|
"//build:branding_buildflags",
|
||||||
"//cc",
|
"//cc",
|
||||||
@@ -18,7 +18,7 @@ index 5f82bb3beaf7..7183b9dc8005 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -2311,6 +2313,10 @@ static_library("browser") {
|
@@ -2300,6 +2302,10 @@ static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||||
index 6270fdc0a32f..5ba70bf0ecda 100644
|
index 4a31f9315ce8..157c35764f76 100644
|
||||||
--- chrome/browser/ui/BUILD.gn
|
--- chrome/browser/ui/BUILD.gn
|
||||||
+++ chrome/browser/ui/BUILD.gn
|
+++ chrome/browser/ui/BUILD.gn
|
||||||
@@ -9,6 +9,7 @@ import("//build/config/crypto.gni")
|
@@ -9,6 +9,7 @@ import("//build/config/crypto.gni")
|
||||||
@@ -10,7 +10,7 @@ index 6270fdc0a32f..5ba70bf0ecda 100644
|
|||||||
import("//chrome/browser/buildflags.gni")
|
import("//chrome/browser/buildflags.gni")
|
||||||
import("//chrome/common/features.gni")
|
import("//chrome/common/features.gni")
|
||||||
import("//chromeos/assistant/assistant.gni")
|
import("//chromeos/assistant/assistant.gni")
|
||||||
@@ -360,6 +361,10 @@ static_library("ui") {
|
@@ -358,6 +359,10 @@ static_library("ui") {
|
||||||
"//build/config/compiler:wexit_time_destructors",
|
"//build/config/compiler:wexit_time_destructors",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ index 6270fdc0a32f..5ba70bf0ecda 100644
|
|||||||
# Since browser and browser_ui actually depend on each other,
|
# Since browser and browser_ui actually depend on each other,
|
||||||
# we must omit the dependency from browser_ui to browser.
|
# we must omit the dependency from browser_ui to browser.
|
||||||
# However, this means browser_ui and browser should more or less
|
# However, this means browser_ui and browser should more or less
|
||||||
@@ -381,6 +386,7 @@ static_library("ui") {
|
@@ -379,6 +384,7 @@ static_library("ui") {
|
||||||
"//base/allocator:buildflags",
|
"//base/allocator:buildflags",
|
||||||
"//build:branding_buildflags",
|
"//build:branding_buildflags",
|
||||||
"//cc/paint",
|
"//cc/paint",
|
||||||
@@ -29,7 +29,7 @@ index 6270fdc0a32f..5ba70bf0ecda 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -1487,6 +1493,7 @@ static_library("ui") {
|
@@ -1491,6 +1497,7 @@ static_library("ui") {
|
||||||
"//components/keep_alive_registry",
|
"//components/keep_alive_registry",
|
||||||
"//components/network_session_configurator/common",
|
"//components/network_session_configurator/common",
|
||||||
"//components/page_load_metrics/browser",
|
"//components/page_load_metrics/browser",
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||||
index dd86e2e35910..624904c5fef2 100644
|
index b4087b7737c2..ff13279d154e 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.cc
|
--- chrome/browser/chrome_content_browser_client.cc
|
||||||
+++ chrome/browser/chrome_content_browser_client.cc
|
+++ chrome/browser/chrome_content_browser_client.cc
|
||||||
@@ -1001,10 +1001,6 @@ void LaunchURL(const GURL& url,
|
@@ -1003,10 +1003,6 @@ void LaunchURL(const GURL& url,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ index dd86e2e35910..624904c5fef2 100644
|
|||||||
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
|
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
|
||||||
// |allowlist| combines pref/policy + cmdline switch in the browser process.
|
// |allowlist| combines pref/policy + cmdline switch in the browser process.
|
||||||
// For renderer and utility (e.g. NetworkService) processes the switch is the
|
// For renderer and utility (e.g. NetworkService) processes the switch is the
|
||||||
@@ -1171,6 +1167,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
|
@@ -1173,6 +1169,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
|
||||||
return *greased_brand_version_list;
|
return *greased_brand_version_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ index dd86e2e35910..624904c5fef2 100644
|
|||||||
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
||||||
if (command_line->HasSwitch(switches::kUserAgent)) {
|
if (command_line->HasSwitch(switches::kUserAgent)) {
|
||||||
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
||||||
index cd96f6bf1cb7..007d024f7dc8 100644
|
index 219eac813d9b..f933fc41ab85 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.h
|
--- chrome/browser/chrome_content_browser_client.h
|
||||||
+++ chrome/browser/chrome_content_browser_client.h
|
+++ chrome/browser/chrome_content_browser_client.h
|
||||||
@@ -90,7 +90,8 @@ class ChromeXrIntegrationClient;
|
@@ -90,7 +90,8 @@ class ChromeXrIntegrationClient;
|
||||||
|
@@ -240,7 +240,7 @@ index bec2919abc99..4186be149a81 100644
|
|||||||
std::string /* mime_type */,
|
std::string /* mime_type */,
|
||||||
bool /* found */,
|
bool /* found */,
|
||||||
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
|
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
|
||||||
index 5c344d9b9ff7..776e506d2a10 100644
|
index c8c1e668d087..f8e7f39dd96f 100644
|
||||||
--- content/public/browser/content_browser_client.cc
|
--- content/public/browser/content_browser_client.cc
|
||||||
+++ content/public/browser/content_browser_client.cc
|
+++ content/public/browser/content_browser_client.cc
|
||||||
@@ -9,7 +9,7 @@
|
@@ -9,7 +9,7 @@
|
||||||
@@ -253,7 +253,7 @@ index 5c344d9b9ff7..776e506d2a10 100644
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||||
index d6c203ab546d..621bf11f32e9 100644
|
index b211fea98791..1492a74be337 100644
|
||||||
--- content/public/browser/content_browser_client.h
|
--- content/public/browser/content_browser_client.h
|
||||||
+++ content/public/browser/content_browser_client.h
|
+++ content/public/browser/content_browser_client.h
|
||||||
@@ -28,6 +28,7 @@
|
@@ -28,6 +28,7 @@
|
||||||
|
@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
|
|||||||
|
|
||||||
} // namespace content
|
} // namespace content
|
||||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index 32bf02853741..84ceaed97471 100644
|
index a0e62a06462d..00d3fd88abad 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -2736,6 +2736,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
@@ -2740,6 +2740,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||||
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,10 +57,10 @@ index 32bf02853741..84ceaed97471 100644
|
|||||||
const WebInputEvent& event) {
|
const WebInputEvent& event) {
|
||||||
if ((base::FeatureList::IsEnabled(
|
if ((base::FeatureList::IsEnabled(
|
||||||
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
||||||
index 88d4c4a3b45b..cd0d0f909933 100644
|
index 950fc6e8e5e6..dfd00881ac39 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_impl.h
|
--- content/browser/renderer_host/render_widget_host_impl.h
|
||||||
+++ content/browser/renderer_host/render_widget_host_impl.h
|
+++ content/browser/renderer_host/render_widget_host_impl.h
|
||||||
@@ -737,6 +737,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
@@ -738,6 +738,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||||
|
|
||||||
void ProgressFlingIfNeeded(base::TimeTicks current_time);
|
void ProgressFlingIfNeeded(base::TimeTicks current_time);
|
||||||
void StopFling();
|
void StopFling();
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
|
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
|
||||||
index 65065b781a0a..b4a165878175 100644
|
index 9122bbf4f15c..b6a190193a87 100644
|
||||||
--- chrome/browser/printing/print_job_worker.cc
|
--- chrome/browser/printing/print_job_worker.cc
|
||||||
+++ chrome/browser/printing/print_job_worker.cc
|
+++ chrome/browser/printing/print_job_worker.cc
|
||||||
@@ -134,6 +134,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
|
@@ -134,6 +134,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
|
||||||
|
@@ -181,7 +181,7 @@ index 2c3f75ea4ad1..2e639893913b 100644
|
|||||||
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
||||||
|
|
||||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||||
index 6589fe215cfa..481fabeef3a1 100644
|
index 93a2baf855d3..87e8ba113005 100644
|
||||||
--- services/network/public/mojom/network_context.mojom
|
--- services/network/public/mojom/network_context.mojom
|
||||||
+++ services/network/public/mojom/network_context.mojom
|
+++ services/network/public/mojom/network_context.mojom
|
||||||
@@ -258,6 +258,9 @@ struct NetworkContextParams {
|
@@ -258,6 +258,9 @@ struct NetworkContextParams {
|
||||||
|
@@ -144,7 +144,7 @@ index 2bb30e5318b6..535535dd6c10 100644
|
|||||||
|
|
||||||
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
|
||||||
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
|
||||||
index ffb3a04236be..fa746c7fd350 100644
|
index 69e54c41c610..43d312d65a88 100644
|
||||||
--- content/browser/compositor/viz_process_transport_factory.cc
|
--- content/browser/compositor/viz_process_transport_factory.cc
|
||||||
+++ content/browser/compositor/viz_process_transport_factory.cc
|
+++ content/browser/compositor/viz_process_transport_factory.cc
|
||||||
@@ -404,8 +404,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
@@ -404,8 +404,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
|
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
|
||||||
index 08a017090502..6ef3584b2fe6 100644
|
index 6c62af01ad24..5817ddf75b61 100644
|
||||||
--- third_party/blink/renderer/core/input/pointer_event_manager.cc
|
--- third_party/blink/renderer/core/input/pointer_event_manager.cc
|
||||||
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc
|
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc
|
||||||
@@ -310,7 +310,7 @@ void PointerEventManager::HandlePointerInterruption(
|
@@ -310,7 +310,7 @@ void PointerEventManager::HandlePointerInterruption(
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||||
index 9cd853cbda6a..5643832919a7 100644
|
index dce0dcaa5525..020762184c14 100644
|
||||||
--- chrome/app/generated_resources.grd
|
--- chrome/app/generated_resources.grd
|
||||||
+++ chrome/app/generated_resources.grd
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -4996,7 +4996,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
@@ -5017,7 +5017,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||||
</message>
|
</message>
|
||||||
</if>
|
</if>
|
||||||
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
||||||
|
Reference in New Issue
Block a user