Status Trays delayed visibility

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 2012 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 "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 634 matching lines @@
                       OnAutoHideStateChanged(state_.auto_hide_state));
   }
 }
 
 void ShelfLayoutManager::UpdateBoundsAndOpacity(
     const TargetBounds& target_bounds,
     bool animate,
     ui::ImplicitAnimationObserver* observer) {
   base::AutoReset<bool> auto_reset_updating_bounds(&updating_bounds_, true);
 
+  // Setting visibility after enabling animations cause the visibile property to
+  // animate. Enable visibility here so that opacity can animate.
+  if (target_bounds.status_opacity)
+    shelf_->status_area_widget()->Show();

[flackr, 2014/09/23 19:14:03]

This doesn't cause the invalid window state (Visible window with 0 opacity)
updating visibility before we've set target opacity?

If you call show after setting up the opacity animation, but outside of the
scope of the ScopedLayerAnimationSettings it should not have the invalid state.

[jonross, 2014/09/23 20:50:06]

This apparently does trigger an invalid state, however it seems that it should.

Window::Show() performs the invalid state checks before calling
SetVisible(true). So a window can be set to visible=false and opacity=0, then
Show() would trigger visible=true and opacity=0 after the current check.

[jonross, 2014/09/23 21:06:20]

Moved it for correctness.

+
   ui::ScopedLayerAnimationSettings shelf_animation_setter(
       GetLayer(shelf_)->GetAnimator());
   ui::ScopedLayerAnimationSettings status_animation_setter(
       GetLayer(shelf_->status_area_widget())->GetAnimator());
   if (animate) {
     int duration = duration_override_in_ms_ ? duration_override_in_ms_ :
                                               kCrossFadeDurationMS;
     shelf_animation_setter.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(duration));
     shelf_animation_setter.SetTweenType(gfx::Tween::EASE_OUT);
@@ skipping 14 matching lines @@
 
   GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
   shelf_->SetBounds(ScreenUtil::ConvertRectToScreen(
        shelf_->GetNativeView()->parent(),
        target_bounds.shelf_bounds_in_root));
 
   GetLayer(shelf_->status_area_widget())->SetOpacity(
       target_bounds.status_opacity);
 
   // Having a window which is visible but does not have an opacity is an illegal
-  // state. We therefore show / hide the shelf here if required.
+  // state. We therefore hide the shelf here if required.
   if (!target_bounds.status_opacity)
     shelf_->status_area_widget()->Hide();
-  else if (target_bounds.status_opacity)
-    shelf_->status_area_widget()->Show();
 
   // TODO(harrym): Once status area widget is a child view of shelf
   // this can be simplified.
   gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
   status_bounds.set_x(status_bounds.x() +
                       target_bounds.shelf_bounds_in_root.x());
   status_bounds.set_y(status_bounds.y() +
                       target_bounds.shelf_bounds_in_root.y());
   shelf_->status_area_widget()->SetBounds(
       ScreenUtil::ConvertRectToScreen(
@@ skipping 436 matching lines @@
 
 void ShelfLayoutManager::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
   UpdateBoundsAndOpacity(target_bounds, true, NULL);
   UpdateVisibilityState();
 }
 
 }  // namespace ash