bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-22 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 94.0.4606.12

Browse Source
This commit is contained in:
Marshall Greenblatt 2021-08-24 18:23:42 -04:00
parent 0fa40110e3
commit ab0fdbc7a3
10 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/94.0.4606.0'
'chromium_checkout': 'refs/tags/94.0.4606.12',
'depot_tools_checkout': '64a9f33bdd'
}

8
libcef/browser/ssl_host_state_delegate.cc
View File

@ -55,11 +55,15 @@ bool CefSSLHostStateDelegate::DidHostRunInsecureContent(
return false;
}
void CefSSLHostStateDelegate::AllowHttpForHost(const std::string& host) {
void CefSSLHostStateDelegate::AllowHttpForHost(
const std::string& host,
content::WebContents* web_contents) {
// Intentional no-op.
}
bool CefSSLHostStateDelegate::IsHttpAllowedForHost(const std::string& host) {
bool CefSSLHostStateDelegate::IsHttpAllowedForHost(
const std::string& host,
content::WebContents* web_contents) {
// Intentional no-op. Return value does not matter as HTTPS-Only Mode is not
// enabled.
return false;

6
libcef/browser/ssl_host_state_delegate.h
View File

@ -64,8 +64,10 @@ class CefSSLHostStateDelegate : public content::SSLHostStateDelegate {
bool DidHostRunInsecureContent(const std::string& host,
int child_id,
InsecureContentType content_type) override;
void AllowHttpForHost(const std::string& host) override;
bool IsHttpAllowedForHost(const std::string& host) override;
void AllowHttpForHost(const std::string& host,
content::WebContents* web_contents) override;
bool IsHttpAllowedForHost(const std::string& host,
content::WebContents* web_contents) override;
void RevokeUserAllowExceptions(const std::string& host) override;
bool HasAllowException(const std::string& host,
content::WebContents* web_contents) override;

2
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644
return false;
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index b6a5989bbee66..10c942ddc793c 100644
index b6a5989bbee66..622e68ccecc70 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -262,6 +262,20 @@

4
patch/patches/chrome_browser_net_export.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index bab9ce1d4662e..afefbe5f25ce2 100644
index 839907dd232a2..38edcddb6d755 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -29,7 +29,7 @@ index bab9ce1d4662e..afefbe5f25ce2 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -4947,6 +4953,7 @@ static_library("ui") {
@@ -4948,6 +4954,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

4
patch/patches/chrome_browser_profiles.patch
View File

@ -85,10 +85,10 @@ index 4d0cc18bd6a85..76adcbd9b7fcc 100644
virtual bool IsSignedIn() = 0;
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index 677206fe6701d..50248ef60f428 100644
index 569a2780dab4c..b46ff6fa0b2b7 100644
--- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc
@@ -973,7 +973,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -985,7 +985,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile);

4
patch/patches/chrome_runtime.patch
View File

@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 69b31dd94edae..e5931622edb3c 100644
index ef7caebafd36e..d9708e25c9505 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@ -167,7 +167,7 @@ index 69b31dd94edae..e5931622edb3c 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -3475,9 +3476,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3481,9 +3482,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // defined(OS_ANDROID)

10
patch/patches/content_2015.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index 1891a950448c9..cf6cdb676edc9 100644
index 2e0bcdd47dea9..79cc0943c5dc9 100644
--- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc
@@ -677,7 +677,7 @@ void IsHandledBySafePlugin(int render_process_id,
@@ -678,7 +678,7 @@ void IsHandledBySafePlugin(int render_process_id,
content::PluginService* plugin_service =
content::PluginService::GetInstance();
bool plugin_found = plugin_service->GetPluginInfo(
@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 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 714fd5889f254..9dc0414f02c55 100644
index 3bfb10467c5c8..399f939fd32c6 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -12008,6 +12008,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -12009,6 +12009,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@ -199,7 +199,7 @@ index 714fd5889f254..9dc0414f02c55 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -12015,7 +12016,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -12016,7 +12017,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(

2
patch/patches/views_widget.patch
View File

@ -144,7 +144,7 @@ index 9d0bc6966680f..152c6f01059b6 100644
req.y = bounds_in_pixels_.y();
req.width = bounds_in_pixels_.width();
diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
index 7c352dd0d992d..cf1a0c3e6db63 100644
index 7c352dd0d992d..516623a91b0e1 100644
--- ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -20,6 +20,8 @@ DesktopScreenWin::~DesktopScreenWin() {

2
patch/patches/webkit_plugin_info_2015.patch
View File

@ -44,7 +44,7 @@ index 463e3e5e73419..97aaf0da2b9a5 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 16c679be469ab..75985bf7d9c72 100644
index a9c4d4efe4d66..c0c62cbbe60de 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1853,7 +1853,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {