Fix crash bugs of FramePainter.

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/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 129 matching lines @@
       crossfade_opacity_(0),
       crossfade_animation_(NULL),
       size_button_behavior_(SIZE_BUTTON_MAXIMIZES) {
   if (!instances_)
     instances_ = new std::set<FramePainter*>();
   instances_->insert(this);
 }
 
 FramePainter::~FramePainter() {
   // Sometimes we are destroyed before the window closes, so ensure we clean up.
-  if (window_)
+  if (window_) {
+    aura::RootWindow* root = window_->GetRootWindow();
+    if (root &&
+        root->GetProperty(internal::kSoloWindowFramePainterKey) == this) {
+      root->SetProperty(internal::kSoloWindowFramePainterKey,
+                        static_cast<FramePainter*>(NULL));
+    }
     window_->RemoveObserver(this);
+  }
   instances_->erase(this);
 }
 
 void FramePainter::Init(views::Widget* frame,
                         views::View* window_icon,
                         views::ImageButton* size_button,
                         views::ImageButton* close_button,
                         SizeButtonBehavior behavior) {
   DCHECK(frame);
   // window_icon may be NULL.
@@ skipping 586 matching lines @@
 void FramePainter::UpdateSoloWindowFramePainter(
     aura::Window* ignorable_window) {
   aura::RootWindow* root = window_->GetRootWindow();
   if (!root)
     return;
 
   FramePainter* old_solo_painter = root->GetProperty(
       internal::kSoloWindowFramePainterKey);
   FramePainter* new_solo_painter = GetSoloPainterInRoot(ignorable_window);
   if (old_solo_painter != new_solo_painter) {
-    if (old_solo_painter)
+    if (old_solo_painter && old_solo_painter->frame_ &&
+        old_solo_painter->frame_->non_client_view()) {
       old_solo_painter->frame_->non_client_view()->SchedulePaint();
+    }
     window_->GetRootWindow()->SetProperty(
         internal::kSoloWindowFramePainterKey, new_solo_painter);
-    if (new_solo_painter)
+    if (new_solo_painter && new_solo_painter->frame_ &&
+        new_solo_painter->frame_->non_client_view()) {
       new_solo_painter->frame_->non_client_view()->SchedulePaint();
+    }
   }
 }
 
 void FramePainter::SchedulePaintForHeader() {
   int top_left_height = top_left_corner_->height();
   int top_right_height = top_right_corner_->height();
   frame_->non_client_view()->SchedulePaintInRect(
       gfx::Rect(0, 0, frame_->non_client_view()->width(),
                 std::max(top_left_height, top_right_height)));
 }
 
 gfx::Rect FramePainter::GetTitleBounds(views::NonClientFrameView* view,
                                        const gfx::Font& title_font) {
   int title_x = GetTitleOffsetX();
   // Center the text in the middle of the caption - this way it adapts
   // automatically to the caption height (which is given by the owner).
   int title_y =
       (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash