Fixing crash Report - Magic Signature: views::View::ConvertPointToScreen

ui/views/bubble/bubble_delegate.cc

Index: ui/views/bubble/bubble_delegate.cc
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index af08994d487f5905b3471e806cfb899664de10e0..0cca6f1906a88220cbaac1e0cf14fd93d628102a 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -9,6 +9,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ -128,7 +129,7 @@ Widget* CreateBorderWidget(BubbleDelegateView* bubble) {
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
       close_on_deactivate_(true),
-      anchor_view_(NULL),
+      anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_(BubbleBorder::TOP_LEFT),
@@ -151,7 +152,7 @@ BubbleDelegateView::BubbleDelegateView(
     BubbleBorder::Arrow arrow)
     : close_on_esc_(true),
       close_on_deactivate_(true),
-      anchor_view_(anchor_view),
+      anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_(arrow),
@@ -165,26 +166,21 @@ BubbleDelegateView::BubbleDelegateView(
       border_accepts_events_(true),
       adjust_if_offscreen_(true),
       parent_window_(NULL) {
+  // We set the view into the storage here. CreateBubble will then do the rest

[msw, 2013/09/27 23:45:56]

Just call SetAnchorView here. Even if the anchor's Widget has not been
constructed, it should work okay, and the second SetAnchorView call in
CreateBubble would attempt to locate/observe the anchor widget again, right?
Also, adjust the comment in CreateBubble that you removed to something like "Get
the latest anchor widget from the anchor view at bubble creation time."

[Mr4D (OOO till 08-26), 2013/09/28 00:01:18]

Done.

+  // when calling SetAnchorView.
+  ViewStorage::GetInstance()->StoreView(anchor_view_storage_id_, anchor_view);
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   UpdateColorsFromTheme(GetNativeTheme());
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
-  if (anchor_widget() != NULL)
-    anchor_widget()->RemoveObserver(this);
-  anchor_widget_ = NULL;
-  anchor_view_ = NULL;
+  SetAnchorView(NULL);
 }
 
 // static
 Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate) {
   bubble_delegate->Init();
-  // Determine the anchor widget from the anchor view at bubble creation time.
-  bubble_delegate->anchor_widget_ = bubble_delegate->anchor_view() ?
-      bubble_delegate->anchor_view()->GetWidget() : NULL;
-  if (bubble_delegate->anchor_widget())
-    bubble_delegate->anchor_widget()->AddObserver(bubble_delegate);
-
+  bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
   Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
 
 #if defined(OS_WIN)
@@ -231,11 +227,8 @@ NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
 }
 
 void BubbleDelegateView::OnWidgetDestroying(Widget* widget) {
-  if (anchor_widget() == widget) {
-    anchor_widget_->RemoveObserver(this);
-    anchor_view_ = NULL;
-    anchor_widget_ = NULL;
-  }
+  if (anchor_widget() == widget)
+    SetAnchorView(NULL);
 }
 
 void BubbleDelegateView::OnWidgetVisibilityChanging(Widget* widget,
@@ -267,12 +260,43 @@ void BubbleDelegateView::OnWidgetBoundsChanged(Widget* widget,
     SizeToContents();
 }
 
+View* BubbleDelegateView::GetAnchorView() const {
+  return ViewStorage::GetInstance()->RetrieveView(anchor_view_storage_id_);
+}
+
+void BubbleDelegateView::SetAnchorView(View* anchor_view) {
+  // When the anchor view gets set the associated anchor widget might
+  // change as well.
+  if (!anchor_view || anchor_widget() != anchor_view->GetWidget()) {
+    if (anchor_widget()) {
+      anchor_widget_->RemoveObserver(this);
+      anchor_widget_ = NULL;
+    }
+    if (anchor_view) {
+      anchor_widget_ = anchor_view->GetWidget();
+      if (anchor_widget_)
+        anchor_widget_->AddObserver(this);
+    }
+  }
+
+  // Remove the old storage item and set the new (if there is one).
+  ViewStorage* view_storage = ViewStorage::GetInstance();
+  if (view_storage->RetrieveView(anchor_view_storage_id_))
+    view_storage->RemoveView(anchor_view_storage_id_);
+
+  if (!anchor_view)

[msw, 2013/09/27 23:45:56]

nit: invert this check and call StoreView in its scope.

[Mr4D (OOO till 08-26), 2013/09/28 00:01:18]

Done.

+    return;
+
+  view_storage->StoreView(anchor_view_storage_id_, anchor_view);
+}
+
 gfx::Rect BubbleDelegateView::GetAnchorRect() {
-  if (!anchor_view())
+  if (!GetAnchorView())
     return anchor_rect_;
-  gfx::Rect anchor_bounds = anchor_view()->GetBoundsInScreen();
-  anchor_bounds.Inset(anchor_view_insets_);
-  return anchor_bounds;
+
+  anchor_rect_ = GetAnchorView()->GetBoundsInScreen();
+  anchor_rect_.Inset(anchor_view_insets_);
+  return anchor_rect_;
 }
 
 void BubbleDelegateView::StartFade(bool fade_in) {