1 files changed, 40 insertions, 9 deletions

diff --git a/chromium/components/exo/shell_surface_base.cc b/chromium/components/exo/shell_surface_base.cc
index 315948b4243..2a6951c2f02 100644
--- a/chromium/components/exo/shell_surface_base.cc
+++ b/chromium/components/exo/shell_surface_base.cc
@@ -58,6 +58,14 @@
 namespace exo {
 namespace {
 
+// Set aura::client::kSkipImeProcessing to all Surface descendants.
+void SetSkipImeProcessingToDescendentSurfaces(aura::Window* window) {
+  if (Surface::AsSurface(window))
+    window->SetProperty(aura::client::kSkipImeProcessing, true);
+  for (aura::Window* child : window->children())
+    SetSkipImeProcessingToDescendentSurfaces(child);
+}
+
 // The accelerator keys used to close ShellSurfaces.
 const struct {
   ui::KeyboardCode keycode;
@@ -286,6 +294,8 @@ void CloseAllTransientChildren(aura::Window* window) {
   }
 }
 
+int shell_id = 0;
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -296,7 +306,7 @@ ShellSurfaceBase::ShellSurfaceBase(Surface* surface,
                                    bool activatable,
                                    bool can_minimize,
                                    int container)
-    : SurfaceTreeHost("ExoShellSurfaceHost"),
+    : SurfaceTreeHost(base::StringPrintf("ExoShellSurfaceHost-%d", shell_id)),
       origin_(origin),
       container_(container),
       activatable_(activatable),
@@ -327,6 +337,7 @@ ShellSurfaceBase::~ShellSurfaceBase() {
     root_surface()->RemoveSurfaceObserver(this);
   if (has_grab_)
     WMHelper::GetInstance()->GetCaptureClient()->RemoveObserver(this);
+  CHECK(!views::WidgetObserver::IsInObserverList());
 }
 
 void ShellSurfaceBase::Activate() {
@@ -556,7 +567,7 @@ void ShellSurfaceBase::OnSetFrame(SurfaceFrameType frame_type) {
   }
 
   bool frame_was_disabled = !frame_enabled();
-  // TODO(b/141151475): Make frame_type a committable property.
+  bool frame_type_Changed = frame_type_ != frame_type;
   frame_type_ = frame_type;
   switch (frame_type) {
     case SurfaceFrameType::NONE:
@@ -565,16 +576,15 @@ void ShellSurfaceBase::OnSetFrame(SurfaceFrameType frame_type) {
     case SurfaceFrameType::NORMAL:
     case SurfaceFrameType::AUTOHIDE:
     case SurfaceFrameType::OVERLAY:
+    case SurfaceFrameType::SHADOW:
       // Initialize the shadow if it didn't exist. Do not reset if
       // the frame type just switched from another enabled type or
       // there is a pending shadow_bounds_ change to avoid overriding
       // a shadow bounds which have been changed and not yet committed.
-      if (!shadow_bounds_ || (frame_was_disabled && !shadow_bounds_changed_))
+      if (frame_type_Changed &&
+          (!shadow_bounds_ || (frame_was_disabled && !shadow_bounds_changed_)))
         shadow_bounds_ = gfx::Rect();
       break;
-    case SurfaceFrameType::SHADOW:
-      shadow_bounds_ = gfx::Rect();
-      break;
   }
   if (!widget_)
     return;
@@ -832,6 +842,15 @@ void ShellSurfaceBase::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
 }
 
+void ShellSurfaceBase::OnWindowPropertyChanged(aura::Window* window,
+                                               const void* key,
+                                               intptr_t old_value) {
+  if (widget_ && window == widget_->GetNativeWindow() &&
+      key == aura::client::kSkipImeProcessing) {
+    SetSkipImeProcessingToDescendentSurfaces(window);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // wm::ActivationChangeObserver overrides:
 
@@ -922,7 +941,7 @@ void ShellSurfaceBase::CreateShellSurfaceWidget(
   widget_->AddObserver(this);
 
   aura::Window* window = widget_->GetNativeWindow();
-  window->SetName("ExoShellSurface");
+  window->SetName(base::StringPrintf("ExoShellSurface-%d", shell_id++));
   window->AddChild(host_window());
   // Works for both mash and non-mash. https://crbug.com/839521
   window->SetEventTargetingPolicy(
@@ -1012,8 +1031,6 @@ void ShellSurfaceBase::UpdateShadow() {
   if (!widget_ || !root_surface())
     return;
 
-  shadow_bounds_changed_ = false;
-
   aura::Window* window = widget_->GetNativeWindow();
 
   if (!shadow_bounds_) {
@@ -1037,6 +1054,11 @@ void ShellSurfaceBase::UpdateShadow() {
   }
 }
 
+void ShellSurfaceBase::UpdateFrameType() {
+  // Nothing to do here for now as frame type is updated immediately in
+  // OnSetFrame() by default.
+}
+
 gfx::Rect ShellSurfaceBase::GetVisibleBounds() const {
   // Use |geometry_| if set, otherwise use the visual bounds of the surface.
   if (geometry_.IsEmpty()) {
@@ -1104,6 +1126,14 @@ void ShellSurfaceBase::StartCapture() {
   widget_->SetCapture(nullptr /* view */);
 }
 
+void ShellSurfaceBase::OnPostWidgetCommit() {
+  // |shadow_bounds_changed_| represents whether |shadow_bounds_| has changed
+  // since the last commit, but as UpdateShadow() can be called multiple times
+  // in a single commit process, we need to ensure that it's not reset halfway
+  // in the current commit by resetting it here.
+  shadow_bounds_changed_ = false;
+}
+
 void ShellSurfaceBase::CommitWidget() {
   // Apply new window geometry.
   geometry_ = pending_geometry_;
@@ -1127,6 +1157,7 @@ void ShellSurfaceBase::CommitWidget() {
 
   UpdateWidgetBounds();
   SurfaceTreeHost::UpdateHostWindowBounds();
+  UpdateFrameType();
   UpdateShadow();
 
   // System modal container is used by clients to implement overlay