Merge 133595 - ash: Fix transparency glitches in window header

ash/wm/frame_painter.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/wm/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 94 matching lines @@
   shader->unref();
   // Adjust canvas to compensate for image sampling offset, draw, then adjust
   // back. This is cheaper than pushing/popping the entire canvas state.
   canvas->sk_canvas()->translate(SkIntToScalar(-bitmap_offset_x), 0);
   canvas->sk_canvas()->drawPath(path, *paint);
   canvas->sk_canvas()->translate(SkIntToScalar(bitmap_offset_x), 0);
 }
 
 // Returns true if |window| is a visible, normal window.
 bool IsVisibleNormalWindow(aura::Window* window) {
+  // We must use TargetVisibility() because windows animate in and out and
+  // IsVisible() also tracks the layer visibility state.
   return window &&
-    window->IsVisible() &&
+    window->TargetVisibility() &&
     window->type() == aura::client::WINDOW_TYPE_NORMAL;
 }
 
 }  // namespace
 
 namespace ash {
 
 // static
 int FramePainter::kActiveWindowOpacity = 230;  // "Linus-approved" values
 int FramePainter::kInactiveWindowOpacity = 204;
@@ skipping 329 matching lines @@
   if (ash::wm::IsWindowMaximized(window) ||
       ash::wm::IsWindowFullscreen(window)) {
     window->set_hit_test_bounds_override_inner(gfx::Insets());
   } else {
     window->set_hit_test_bounds_override_inner(
         gfx::Insets(kResizeInsideBoundsSize, kResizeInsideBoundsSize,
                     kResizeInsideBoundsSize, kResizeInsideBoundsSize));
   }
 }
 
+void FramePainter::OnWindowVisibilityChanged(aura::Window* window,
+                                             bool visible) {
+  // Hiding a window may trigger the solo window appearance in a different
+  // window.
+  if (!visible && UseSoloWindowHeader())
+    SchedulePaintForSoloWindow();
+}
+
 void FramePainter::OnWindowDestroying(aura::Window* destroying) {
   DCHECK_EQ(window_, destroying);
   // Must be removed here and not in the destructor, as the aura::Window is
   // already destroyed when our destructor runs.
   window_->RemoveObserver(this);
   window_ = NULL;
 
   // For purposes of painting and solo window computation, we're done.
   instances_->erase(this);
 
   // If we have two or more windows open and we close this one, we might trigger
-  // the solo window appearance.  If so, find the window that is becoming solo
-  // and schedule it to paint.
-  if (UseSoloWindowHeader()) {
-    for (std::set<FramePainter*>::const_iterator it = instances_->begin();
-         it != instances_->end();
-         ++it) {
-      FramePainter* painter = *it;
-      if (IsVisibleNormalWindow(painter->window_) && painter->frame_)
-        painter->frame_->non_client_view()->SchedulePaint();
-    }
-  }
+  // the solo window appearance for another window.
+  if (UseSoloWindowHeader())
+    SchedulePaintForSoloWindow();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FramePainter, private:
 
 void FramePainter::SetButtonImages(views::ImageButton* button,
                                    int normal_bitmap_id,
                                    int hot_bitmap_id,
                                    int pushed_bitmap_id) {
   ui::ThemeProvider* theme_provider = frame_->GetThemeProvider();
@@ skipping 19 matching lines @@
        ++it) {
     if (IsVisibleNormalWindow((*it)->window_)) {
       window_count++;
       if (window_count > 1)
         return false;
     }
   }
   return window_count == 1;
 }
 
+// static
+void FramePainter::SchedulePaintForSoloWindow() {
+  for (std::set<FramePainter*>::const_iterator it = instances_->begin();
+       it != instances_->end();
+       ++it) {
+    FramePainter* painter = *it;
+    if (IsVisibleNormalWindow(painter->window_))
+      painter->frame_->non_client_view()->SchedulePaint();
+  }
+}
+
 }  // namespace ash