Change the way the ToplevelEventHandler is hooked up. It is now both a pre- and post-target event h…

ui/base/events/event.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 "ui/base/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 35 matching lines @@
   float calibrated_y =
       static_cast<float>(point.y()) * to.height() / from.height();
   return gfx::Point(static_cast<int>(floorf(calibrated_x + 0.5f)),
                     static_cast<int>(floorf(calibrated_y + 0.5f)));
 }
 
 }  // namespace
 
 namespace ui {
 
+bool EventCanceledDefaultHandling(const ui::Event& event) {
+  return event.phase() == EP_POSTTARGET && event.result() != ER_UNHANDLED;

[sadrul, 2012/09/12 18:19:33]

Right now, the default handler triggers event if one of the pre-target handlers
return ER_HANDLED. So this check should be !(event.result() & ER_CONSUMED)
(EventDispatcher::ProcessEvent has a comment explaining the current behaviour)

[Ben Goodger (Google), 2012/09/12 18:39:53]

But this function won't even be called if event.result() & ER_CONSUMED, right?

Consumed stops propagation, handled just says "next layer up, don't do the
default thing but keep propagating".

[sadrul, 2012/09/12 18:47:36]

Ah yes. For CONSUMED, this wouldn't be called at all, you are right. I missed in
the comments that this is for post-target handling only.

+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Event
 
 Event::~Event() {
 #if defined(USE_X11)
   if (delete_native_event_)
     delete native_event_;
 #endif
 }
 
@@ skipping 449 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui