From aaed6fe837b284be5aa001ef85ecbc8224105d0b Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 29 Nov 2023 12:15:41 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/00Fix-chromium-build-bugs.patch | 4 ++-- build/patches/Move-navigation-bar-to-bottom.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/patches/00Fix-chromium-build-bugs.patch b/build/patches/00Fix-chromium-build-bugs.patch index 8235431a2..67e2a7943 100644 --- a/build/patches/00Fix-chromium-build-bugs.patch +++ b/build/patches/00Fix-chromium-build-bugs.patch @@ -464,9 +464,9 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow RenderFrameHost* host, mojo::PendingReceiver receiver) { + if ((true)) return; - auto* view = static_cast(host->GetView()); + auto* view = + RenderWidgetHostViewAndroid::FromRenderWidgetHostView(host->GetView()); if (!view || !view->text_suggestion_host()) - return; diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 2cf1f404b..a9ad6738d 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -2624,7 +2624,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/slim/layer.h" #include "components/viz/common/features.h" -@@ -857,6 +858,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -868,6 +869,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio;