bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 97.0.4692.36

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-12-03 17:21:32 +00:00
committed by Marshall Greenblatt
parent ac129eb78e
commit 4eb2da6aac
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/97.0.4692.20', 'chromium_checkout': 'refs/tags/97.0.4692.36',
'depot_tools_checkout': 'f7b8f8f3cd' 'depot_tools_checkout': 'f7b8f8f3cd'
} }

4
patch/patches/build.patch
View File

@@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index bc3de06d0255b..ed84c1120d19d 100644 index bd1fefeff6f60..54b74ee390d7a 100644
--- build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -1765,8 +1765,6 @@ config("thin_archive") { @@ -1769,8 +1769,6 @@ config("thin_archive") {
# confuses lldb. # confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ] arflags = [ "-T" ]

2
patch/patches/chrome_browser.patch
View File

@@ -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 ff1567db95bbb..76b942142f854 100644 index d189c06a28cf6..1071b887e9888 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni") @@ -13,6 +13,7 @@ import("//build/config/features.gni")

2
patch/patches/chrome_runtime_views.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 4571235afb4fa..af507323d9097 100644 index 579da68e02f31..e957888a23456 100644
--- chrome/browser/ui/browser_command_controller.cc --- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc
@@ -369,8 +369,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -369,8 +369,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(

12
patch/patches/content_2015.patch
View File

@@ -133,10 +133,10 @@ index 0b098038d2f56..bd85dbf2727c1 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 4f7ea9bd9117e..3e325c0514de0 100644 index 08ea5ace12e7d..6c020ae6c5145 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -663,6 +663,8 @@ void RenderThreadImpl::Init() { @@ -636,6 +636,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider( GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame); blink::URLLoaderThrottleProviderType::kFrame);
@@ -146,10 +146,10 @@ index 4f7ea9bd9117e..3e325c0514de0 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 6616ad76bc307..95524ec98ce5c 100644 index 1b89812ad4297..7bbc927e03580 100644
--- content/renderer/renderer_blink_platform_impl.cc --- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc
@@ -1086,6 +1086,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { @@ -1094,6 +1094,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -166,10 +166,10 @@ index 6616ad76bc307..95524ec98ce5c 100644
RendererBlinkPlatformImpl::GetCodeCacheHost() { RendererBlinkPlatformImpl::GetCodeCacheHost() {
base::AutoLock lock(code_cache_host_lock_); base::AutoLock lock(code_cache_host_lock_);
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 745204f21d304..87b7767fcba68 100644 index f56214039bf15..77b71b1f9f771 100644
--- content/renderer/renderer_blink_platform_impl.h --- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h
@@ -262,6 +262,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -263,6 +263,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
const blink::WebURL& url, const blink::WebURL& url,
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override; blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;

10
patch/patches/views_widget.patch
View File

@@ -152,10 +152,10 @@ index adcf1eeaa3574..0748d570624cd 100644
// Set the view's active state (i.e., tint state of controls). // Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0; virtual void SetActive(bool active) = 0;
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index a47c7c48dc67f..87ac5cf77cb49 100644 index 3045c8d9e61fb..11ee6590eff11 100644
--- ui/platform_window/x11/x11_window.cc --- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc
@@ -1704,7 +1704,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { @@ -1709,7 +1709,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0; req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds); bounds_in_pixels_ = SanitizeBounds(bounds);
@@ -179,7 +179,7 @@ index 7c352dd0d992d..516623a91b0e1 100644
return host ? host->GetAcceleratedWidget() : nullptr; return host ? host->GetAcceleratedWidget() : nullptr;
} }
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
index 9c3dec8dfdd32..a523cceb5aed3 100644 index 80d1019a5661b..48073dd9540e4 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop( @@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -211,7 +211,7 @@ index 9c3dec8dfdd32..a523cceb5aed3 100644
properties->x11_extension_delegate = this; properties->x11_extension_delegate = this;
} }
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
index 5ac7051b4a002..84b8ceb053e75 100644 index 35caab2f2f06a..f372ad1e4c672 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
@@ -87,6 +87,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux @@ -87,6 +87,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -232,7 +232,7 @@ index 5ac7051b4a002..84b8ceb053e75 100644
// PlatformWindowDelegate: // PlatformWindowDelegate:
void DispatchEvent(ui::Event* event) override; void DispatchEvent(ui::Event* event) override;
@@ -152,6 +156,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux @@ -153,6 +157,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
// destroyed. // destroyed.
static std::list<gfx::AcceleratedWidget>* open_windows_; static std::list<gfx::AcceleratedWidget>* open_windows_;

4
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index da429c7f7daf9..936832defe769 100644 index 74fd52490d65a..9d817a891ba72 100644
--- third_party/blink/public/platform/platform.h --- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h
@@ -864,6 +864,11 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -873,6 +873,11 @@ class BLINK_PLATFORM_EXPORT Platform {
const WebURL& url, const WebURL& url,
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {} blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {}