Aura: New window shadows, desktop background debug toggle

ash/wm/shadow.cc

Index: ash/wm/shadow.cc
diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc
index e25a8e428066576601d69880868e17168accd500..8f33765d50e067e7064f5ff31a87f24d9d5ce86a 100644
--- a/ash/wm/shadow.cc
+++ b/ash/wm/shadow.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,6 +7,20 @@
 #include "ash/wm/image_grid.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/compositor/scoped_layer_animation_settings.h"
+
+namespace {
+
+// Shadow opacity for active window.
+const float kActiveShadowOpacity = 1.0f;
+
+// Shadow opacity for inactive window.
+const float kInactiveShadowOpacity = 0.2f;
+
+// Duration for opacity animation in milliseconds.
+const int64 kAnimationDurationMs = 200;
+
+}  // namespace
 
 namespace ash {
 namespace internal {
@@ -17,35 +31,117 @@ Shadow::Shadow() {
 Shadow::~Shadow() {
 }
 
-ui::Layer* Shadow::layer() const { return image_grid_->layer(); }
-
 void Shadow::Init() {
+  style_ = STYLE_ACTIVE;
   image_grid_.reset(new ImageGrid);
-
-  ResourceBundle& res = ResourceBundle::GetSharedInstance();
-  image_grid_->Init(&res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP_LEFT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP_RIGHT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_LEFT),
-                    NULL,
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_RIGHT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM_LEFT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM_RIGHT));
+  UpdateImagesForStyle();
+  image_grid_->layer()->set_name("Shadow");
+  image_grid_->layer()->SetOpacity(kActiveShadowOpacity);
 }
 
 void Shadow::SetContentBounds(const gfx::Rect& content_bounds) {
   content_bounds_ = content_bounds;
+  UpdateImageGridBounds();
+}
+
+ui::Layer* Shadow::layer() const {
+  return image_grid_->layer();
+}
+
+void Shadow::SetStyle(Style style) {
+  if (style_ == style)
+    return;
+  style_ = style;
+
+  // Stop waiting for any as yet unfinished implicit animations.
+  StopObservingImplicitAnimations();
+
+  // If we're becoming active, switch images now.  Because the inactive image
+  // has a very low opacity the switch isn't noticeable and this approach
+  // allows us to use only a single set of shadow images at a time.
+  if (style == STYLE_ACTIVE) {
+    UpdateImagesForStyle();
+    // Opacity was baked into inactive image, start opacity low to match.
+    image_grid_->layer()->SetOpacity(kInactiveShadowOpacity);
+  }
+
+  {
+    // Property sets within this scope will be implicitly animated.
+    ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
+    settings.AddObserver(this);
+    settings.SetTransitionDuration(
+        base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
+    switch (style_) {
+      case STYLE_ACTIVE:
+        image_grid_->layer()->SetOpacity(kActiveShadowOpacity);
+        break;
+      case STYLE_INACTIVE:
+        image_grid_->layer()->SetOpacity(kInactiveShadowOpacity);
+        break;
+      default:
+        NOTREACHED();
+        break;
+    }
+  }
+}
+
+void Shadow::OnImplicitAnimationsCompleted() {
+  // If we just finished going inactive, switch images.  This doesn't cause
+  // a visual pop because the inactive image opacity is so low.
+  if (style_ == STYLE_INACTIVE) {
+    UpdateImagesForStyle();
+    // Opacity is baked into inactive image, so set fully opaque.
+    image_grid_->layer()->SetOpacity(1.0f);
+  }
+}
+
+void Shadow::UpdateImagesForStyle() {
+  ResourceBundle& res = ResourceBundle::GetSharedInstance();
+  switch (style_) {
+    case STYLE_ACTIVE:
+      image_grid_->SetImages(
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP_LEFT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_LEFT),
+          NULL,
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_RIGHT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM),
+          &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT));
+      break;
+    case STYLE_INACTIVE:
+      image_grid_->SetImages(
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP_LEFT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_LEFT),
+          NULL,
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_RIGHT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM),
+          &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT));
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+
+  // Image sizes may have changed.
+  UpdateImageGridBounds();
+}
+
+void Shadow::UpdateImageGridBounds() {
   image_grid_->SetSize(
-      gfx::Size(content_bounds.width() +
+      gfx::Size(content_bounds_.width() +
                     image_grid_->left_image_width() +
                     image_grid_->right_image_width(),
-                content_bounds.height() +
+                content_bounds_.height() +
                     image_grid_->top_image_height() +
                     image_grid_->bottom_image_height()));
   image_grid_->layer()->SetBounds(
-      gfx::Rect(content_bounds.x() - image_grid_->left_image_width(),
-                content_bounds.y() - image_grid_->top_image_height(),
+      gfx::Rect(content_bounds_.x() - image_grid_->left_image_width(),
+                content_bounds_.y() - image_grid_->top_image_height(),
                 image_grid_->layer()->bounds().width(),
                 image_grid_->layer()->bounds().height()));
 }