mash: Fix DCHECK when clicking on window close box

ui/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/events/event.h"
 
 #include <utility>
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
@@ skipping 703 matching lines @@
 void TouchEvent::FixRotationAngle() {
   while (rotation_angle_ < 0)
     rotation_angle_ += 180;
   while (rotation_angle_ >= 180)
     rotation_angle_ -= 180;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PointerEvent
 
+bool PointerEvent::CanConvertFrom(const Event& event) {
+  switch (event.type()) {
+    case ET_MOUSE_PRESSED:
+    case ET_MOUSE_DRAGGED:
+    case ET_MOUSE_MOVED:
+    case ET_MOUSE_ENTERED:
+    case ET_MOUSE_EXITED:
+    case ET_MOUSE_RELEASED:
+    case ET_TOUCH_PRESSED:
+    case ET_TOUCH_MOVED:
+    case ET_TOUCH_RELEASED:
+    case ET_TOUCH_CANCELLED:
+      return true;
+    default:
+      return false;
+  }
+}
+
 PointerEvent::PointerEvent(const PointerEvent& pointer_event)
     : LocatedEvent(pointer_event),
       pointer_id_(pointer_event.pointer_id()),
       details_(pointer_event.pointer_details()) {}
 
 PointerEvent::PointerEvent(const MouseEvent& mouse_event)
     : LocatedEvent(mouse_event),
       pointer_id_(kMousePointerId),
       details_(mouse_event.pointer_details()) {
   switch (mouse_event.type()) {

[msw, 2016/03/29 17:50:27]

nit: DCHECK CanConvertFrom here?

[James Cook, 2016/03/29 18:23:27]

Done.

     case ET_MOUSE_PRESSED:
       SetType(ET_POINTER_DOWN);
       break;
 
     case ET_MOUSE_DRAGGED:
     case ET_MOUSE_MOVED:
       SetType(ET_POINTER_MOVED);
       break;
 
     case ET_MOUSE_ENTERED:
@@ skipping 10 matching lines @@
 
     default:
       NOTREACHED();
   }
 }
 
 PointerEvent::PointerEvent(const TouchEvent& touch_event)
     : LocatedEvent(touch_event),
       pointer_id_(touch_event.touch_id()),
       details_(touch_event.pointer_details()) {
   switch (touch_event.type()) {

[msw, 2016/03/29 17:50:27]

nit: DCHECK CanConvertFrom here?

[James Cook, 2016/03/29 18:23:27]

Done.

     case ET_TOUCH_PRESSED:
       SetType(ET_POINTER_DOWN);
       break;
 
     case ET_TOUCH_MOVED:
       SetType(ET_POINTER_MOVED);
       break;
 
     case ET_TOUCH_RELEASED:
       SetType(ET_POINTER_UP);
@@ skipping 372 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui