summaryrefslogtreecommitdiff
path: root/chromium/components/exo/sub_surface.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/exo/sub_surface.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/exo/sub_surface.cc')
-rw-r--r--chromium/components/exo/sub_surface.cc6
1 files changed, 6 insertions, 0 deletions
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: