Merge pull request #562 from uazo/create-pull-request/patch-580bc2e

Autorebase for 119.0.6045.200
This commit is contained in:
uazo
2023-11-29 15:17:40 +03:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
@@ -464,9 +464,9 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow
RenderFrameHost* host,
mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver) {
+ if ((true)) return;
auto* view = static_cast<RenderWidgetHostViewAndroid*>(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
@@ -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;