Don't send activation event when created

components/exo/wayland/server.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/exo/wayland/server.h"
 
 #include <alpha-compositing-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v2-server-protocol.h>
 #include <grp.h>
@@ skipping 142 matching lines @@
 // A property key containing a boolean set to true if a security object is
 // associated with window.
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasSecurityKey, false);
 
 // A property key containing a boolean set to true if a blending object is
 // associated with window.
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasBlendingKey, false);
 
 // A property key containing a boolean set to true whether the current
 // OnWindowActivated invocation should be ignored.
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIgnoreWindowActivated, false);
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIgnoreWindowActivated, true);
 
 wl_resource* GetSurfaceResource(Surface* surface) {
   return surface->GetProperty(kSurfaceResourceKey);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_buffer_interface:
 
 void buffer_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
@@ skipping 74 matching lines @@
 
 void surface_set_input_region(wl_client* client,
                               wl_resource* resource,
                               wl_resource* region_resource) {
   GetUserDataAs<Surface>(resource)->SetInputRegion(
       region_resource ? *GetUserDataAs<SkRegion>(region_resource)
                       : SkRegion(SkIRect::MakeLargest()));
 }
 
 void surface_commit(wl_client* client, wl_resource* resource) {
-  GetUserDataAs<Surface>(resource)->Commit();
+  Surface* surface = GetUserDataAs<Surface>(resource);
+  surface->Commit();
+  // Enable the activation event on the shell surface's window.
+  aura::Window* window = surface->window()->parent();
+  if (!window) {
+    return;
+  }
+  Surface* main_surface = ShellSurface::GetMainSurface(window);
+  if (main_surface) {
+    if (window->GetProperty(kIgnoreWindowActivated)) {
+      window->SetProperty(kIgnoreWindowActivated, false);

[reveman, 2017/05/05 18:04:29]

Can we use an aura::WindowObserver for this instead? Create and add it when the
remote shell surfaces is created? Maybe set it to false when
OnWindowVisibilityChanged is called. That would keep this workaround nicely
separated from non remote-shell code that doesn't need it.

[oshima, 2017/05/05 23:09:33]

The window becomes visible before being activated when created,
so this won't work.

But I found a better way. We can just reset the flag on activation. PTAL

+    }
+  }
 }
 
 void surface_set_buffer_transform(wl_client* client,
                                   wl_resource* resource,
                                   int transform) {
   NOTIMPLEMENTED();
 }
 
 void surface_set_buffer_scale(wl_client* client,
                               wl_resource* resource,
@@ skipping 1660 matching lines @@
 
 void remote_surface_activate(wl_client* client,
                              wl_resource* resource,
                              uint32_t serial) {
   ShellSurface* shell_surface = GetUserDataAs<ShellSurface>(resource);
   aura::Window* window = shell_surface->GetWidget()->GetNativeWindow();
 
   // Activation on Aura is synchronous, so activation callbacks will be called
   // before the flag is reset.
   window->SetProperty(kIgnoreWindowActivated, true);
-  GetUserDataAs<ShellSurface>(resource)->Activate();
-  window->ClearProperty(kIgnoreWindowActivated);
+  shell_surface->Activate();
+  window->SetProperty(kIgnoreWindowActivated, false);

[oshima, 2017/05/05 23:09:33]

we still need this because activation may fail

 }
 
 void remote_surface_maximize(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Maximize();
 }
 
 void remote_surface_minimize(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Minimize();
 }
 
@@ skipping 2005 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo