Do not call into EventTargeter methods from ViewTargeter

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1012 matching lines @@
   return widget ? widget->GetInputMethod() : NULL;
 }
 
 scoped_ptr<ViewTargeter>
 View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
   scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass();
   targeter_ = targeter.Pass();
   return old_targeter.Pass();
 }
 
+ViewTargeter* View::GetEffectiveViewTargeter() const {
+  ViewTargeter* view_targeter = targeter();

[sadrul, 2014/08/05 16:41:17]

Do a DCHECK() here that GetWidget() is not null

[tdanderson, 2014/08/05 17:18:09]

Done.

+  if (!view_targeter)
+    view_targeter = GetWidget()->GetRootView()->targeter();
+  CHECK(view_targeter);
+  return view_targeter;
+}
+
 bool View::CanAcceptEvent(const ui::Event& event) {
   return IsDrawn();
 }
 
 ui::EventTarget* View::GetParentTarget() {
   return parent_;
 }
 
 scoped_ptr<ui::EventTargetIterator> View::GetChildIterator() const {
   return scoped_ptr<ui::EventTargetIterator>(
@@ skipping 1220 matching lines @@
     if (HitTestPoint(location)) {
       ConvertPointToScreen(this, &location);
       ShowContextMenu(location, ui::MENU_SOURCE_MOUSE);
     }
   } else {
     OnMouseReleased(event);
   }
   // WARNING: we may have been deleted.
 }
 
-ViewTargeter* View::GetEffectiveViewTargeter() const {
-  ViewTargeter* view_targeter = targeter();
-  if (!view_targeter)
-    view_targeter = GetWidget()->GetRootView()->targeter();
-  CHECK(view_targeter);
-  return view_targeter;
-}
-
 // Accelerators ----------------------------------------------------------------
 
 void View::RegisterPendingAccelerators() {
   if (!accelerators_.get() ||
       registered_accelerator_count_ == accelerators_->size()) {
     // No accelerators are waiting for registration.
     return;
   }
 
   if (!GetWidget()) {
@@ skipping 129 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views