Update to Chromium version 93.0.4577.18

This commit is contained in:
CEF Spotify
2021-07-30 17:29:40 +00:00
committed by Marshall Greenblatt
parent 98fe2d01e1
commit 6ebdfec451
18 changed files with 26 additions and 26 deletions

View File

@@ -20,7 +20,7 @@ index eefad1a67760..7318d223a63d 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index 5b830ecbb4a4..39b32f681233 100644
index 986d27fc91a7..1a3f8a899cb7 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -5606,6 +5606,12 @@ url::Origin

View File

@@ -1,5 +1,5 @@
diff --git content/public/browser/web_ui_controller_factory.h content/public/browser/web_ui_controller_factory.h
index eb068fb9bb42c..4e8e6a1a7abf4 100644
index eb068fb9bb42..4e8e6a1a7abf 100644
--- content/public/browser/web_ui_controller_factory.h
+++ content/public/browser/web_ui_controller_factory.h
@@ -47,9 +47,6 @@ class CONTENT_EXPORT WebUIControllerFactory {

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/privacy/BUILD.gn chrome/browser/privacy/BUILD.gn
index cd1f57e009f50..f93721e39e559 100644
index cd1f57e009f5..f93721e39e55 100644
--- chrome/browser/privacy/BUILD.gn
+++ chrome/browser/privacy/BUILD.gn
@@ -93,11 +93,15 @@ if (is_win || is_linux) {
@@ -19,7 +19,7 @@ index cd1f57e009f50..f93721e39e559 100644
}
}
diff --git third_party/protobuf/proto_library.gni third_party/protobuf/proto_library.gni
index a6943f5896cba..1561a868ccef9 100644
index a6943f5896cb..1561a868ccef 100644
--- third_party/protobuf/proto_library.gni
+++ third_party/protobuf/proto_library.gni
@@ -28,6 +28,9 @@

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h
index 78d5b763970c2..de98bd0b325b1 100644
index 78d5b763970c..de98bd0b325b 100644
--- chrome/browser/ui/prefs/pref_watcher.h
+++ chrome/browser/ui/prefs/pref_watcher.h
@@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService {

View File

@@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins);
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index 01bf04ee4615..8c26603be9d0 100644
index 33b210a8bba5..4b13dc734b67 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -11833,6 +11833,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -11954,6 +11954,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -199,7 +199,7 @@ index 01bf04ee4615..8c26603be9d0 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -11840,7 +11841,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -11961,7 +11962,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
@@ -210,10 +210,10 @@ index 01bf04ee4615..8c26603be9d0 100644
std::move(callback).Run(found, info, actual_mime_type);
}
diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
index e63909db27f0..279d0dbce804 100644
index e63f3085b846..f2a4cf1f37ef 100644
--- content/browser/renderer_host/render_frame_host_impl.h
+++ content/browser/renderer_host/render_frame_host_impl.h
@@ -2533,6 +2533,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2531,6 +2531,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int32_t plugin_child_id,
const base::FilePath& path) override;
void GetPluginInfo(const GURL& url,

View File

@@ -1,5 +1,5 @@
diff --git content/public/browser/document_service_base.h content/public/browser/document_service_base.h
index a7d9457f7561a..3296e65dcb0f5 100644
index a7d9457f7561..3296e65dcb0f 100644
--- content/public/browser/document_service_base.h
+++ content/public/browser/document_service_base.h
@@ -83,6 +83,8 @@ class DocumentServiceBase : public Interface, public WebContentsObserver {

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
index 0e5573a7326a2..28eb26fb7af55 100644
index 0e5573a7326a..28eb26fb7af5 100644
--- chrome/browser/font_family_cache.h
+++ chrome/browser/font_family_cache.h
@@ -19,6 +19,8 @@ class Profile;

View File

@@ -1,5 +1,5 @@
diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn
index 8068e573cbd48..2fc10cf03bc50 100644
index 8068e573cbd4..2fc10cf03bc5 100644
--- third_party/libxml/BUILD.gn
+++ third_party/libxml/BUILD.gn
@@ -142,6 +142,7 @@ static_library("libxml") {

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/page_info/chrome_page_info_client.cc chrome/browser/ui/page_info/chrome_page_info_client.cc
index e2972da9e548d..2f356616ed97c 100644
index e2972da9e548..2f356616ed97 100644
--- chrome/browser/ui/page_info/chrome_page_info_client.cc
+++ chrome/browser/ui/page_info/chrome_page_info_client.cc
@@ -17,5 +17,9 @@ std::unique_ptr<PageInfoDelegate> ChromePageInfoClient::CreatePageInfoDelegate(

View File

@@ -1,5 +1,5 @@
diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm
index 7cb3238e97edb..ae800739b6863 100644
index 7cb3238e97ed..ae800739b686 100644
--- content/browser/scheduler/responsiveness/native_event_observer_mac.mm
+++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm
@@ -12,13 +12,15 @@ namespace content {

View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm
index f10c5d161dd13..92a751dd984e5 100644
index f10c5d161dd1..92a751dd984e 100644
--- content/browser/renderer_host/input/fling_scheduler_mac.mm
+++ content/browser/renderer_host/input/fling_scheduler_mac.mm
@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {

View File

@@ -1,5 +1,5 @@
diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
index 98f3c5a43da3b..55bef97cfc336 100644
index 98f3c5a43da3..55bef97cfc33 100644
--- ui/gl/init/gl_initializer_mac.cc
+++ ui/gl/init/gl_initializer_mac.cc
@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index bae294fef1f8..06d2dfcecc95 100644
index 74b51886d2b3..86c4ae54e2ff 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@@ -10,7 +10,7 @@ index bae294fef1f8..06d2dfcecc95 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -670,7 +671,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -669,7 +670,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes).
@@ -31,7 +31,7 @@ index bae294fef1f8..06d2dfcecc95 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -683,7 +696,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -682,7 +695,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);

View File

@@ -1,5 +1,5 @@
diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h
index ec1c6c972ee8d..9f73342051325 100644
index ec1c6c972ee8..9f7334205132 100644
--- ui/base/cocoa/underlay_opengl_hosting_window.h
+++ ui/base/cocoa/underlay_opengl_hosting_window.h
@@ -12,7 +12,7 @@

View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
index 602131e3d6407..7791b570547ed 100644
index 602131e3d640..7791b570547e 100644
--- third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
+++ third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
@@ -11,6 +11,8 @@

View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 07ffb8615708..f60aa9aeae29 100644
index 220e8eed1ff4..2191e5bd8fcd 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5286,7 +5286,7 @@ Keep your key file in a safe place. You will need it to create new versions of y

View File

@@ -1,5 +1,5 @@
diff --git base/third_party/double_conversion/BUILD.gn base/third_party/double_conversion/BUILD.gn
index 0083efdcd9c85..6f647c31e28aa 100644
index 0083efdcd9c8..6f647c31e28a 100644
--- base/third_party/double_conversion/BUILD.gn
+++ base/third_party/double_conversion/BUILD.gn
@@ -9,6 +9,11 @@ config("config") {
@@ -15,7 +15,7 @@ index 0083efdcd9c85..6f647c31e28aa 100644
static_library("double_conversion") {
diff --git base/win/BUILD.gn base/win/BUILD.gn
index eb5dca74bcea3..be10cc59b39c7 100644
index eb5dca74bcea..be10cc59b39c 100644
--- base/win/BUILD.gn
+++ base/win/BUILD.gn
@@ -33,4 +33,7 @@ static_library("pe_image") {