From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/exo/sub_surface.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chromium/components/exo/sub_surface.cc') diff --git a/chromium/components/exo/sub_surface.cc b/chromium/components/exo/sub_surface.cc index b18beb319e5..8c81ed507fe 100644 --- a/chromium/components/exo/sub_surface.cc +++ b/chromium/components/exo/sub_surface.cc @@ -8,6 +8,7 @@ #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" #include "components/exo/surface.h" +#include "ui/aura/client/aura_constants.h" namespace exo { @@ -113,6 +114,11 @@ bool SubSurface::IsInputEnabled(Surface* surface) const { return !parent_ || parent_->IsInputEnabled(surface); } +void SubSurface::OnSetParent(Surface* parent, const gfx::Point&) { + if (parent->window()->GetProperty(aura::client::kSkipImeProcessing)) + surface_->window()->SetProperty(aura::client::kSkipImeProcessing, true); +} + //////////////////////////////////////////////////////////////////////////////// // SurfaceObserver overrides: -- cgit v1.2.1