Fix the wrong non-element node handling in EventHanlder and MouseEventManager

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 634 matching lines @@
     if (is_middle_click_autoscroll_in_progress) {
       // We invalidate the click when exiting middle click auto scroll so that
       // we don't inadvertently navigate away from the current page (e.g. the
       // click was on a hyperlink). See <rdar://problem/6095023>.
       mouse_event_manager_->InvalidateClick();
       return WebInputEventResult::kHandledSuppressed;
     }
   }
 
   mouse_event_manager_->SetClickCount(mouse_event.click_count);
-  mouse_event_manager_->SetClickNode(
-      mev.InnerNode()->IsTextNode()
-          ? FlatTreeTraversal::Parent(*mev.InnerNode())
-          : mev.InnerNode());
+  mouse_event_manager_->SetClickElement(
+      EventHandlingUtil::ParentElementIfNeeded(mev.InnerNode()));
 
   if (!mouse_event.FromTouch())
     frame_->Selection().SetCaretBlinkingSuspended(true);
 
   WebInputEventResult event_result = UpdatePointerTargetAndDispatchEvents(
       EventTypeNames::mousedown, mev.InnerNode(), mev.CanvasRegionId(),
       mev.Event(), Vector<WebMouseEvent>());
 
   if (event_result == WebInputEventResult::kNotHandled && frame_->View()) {
     FrameView* view = frame_->View();
@@ skipping 284 matching lines @@
         String(), mouse_event, Vector<WebMouseEvent>());
   }
 
   // Mouse events simulated from touch should not hit-test again.
   ASSERT(!mouse_event.FromTouch());
 
   HitTestRequest::HitTestRequestType hit_type = HitTestRequest::kRelease;
   HitTestRequest request(hit_type);
   MouseEventWithHitTestResults mev =
       EventHandlingUtil::PerformMouseEventHitTest(frame_, request, mouse_event);
-  Node* release_node = (mev.InnerNode() && mev.InnerNode()->IsTextNode())
-                           ? FlatTreeTraversal::Parent(*mev.InnerNode())
-                           : mev.InnerNode();
+  Element* mouse_release_target =
+      EventHandlingUtil::ParentElementIfNeeded(mev.InnerNode());
   LocalFrame* subframe =
       capturing_mouse_events_node_.Get()
           ? SubframeForTargetNode(capturing_mouse_events_node_.Get())
           : SubframeForHitTestResult(mev);
   if (event_handler_will_reset_capturing_mouse_events_node_)
     capturing_mouse_events_node_ = nullptr;
   if (subframe)
     return PassMouseReleaseEventToSubframe(mev, subframe);
 
   // Mouse events will be associated with the Document where mousedown
@@ skipping 12 matching lines @@
   } else {
     gesture_indicator = WTF::WrapUnique(new UserGestureIndicator(
         DocumentUserGestureToken::Create(frame_->GetDocument())));
   }
 
   WebInputEventResult event_result = UpdatePointerTargetAndDispatchEvents(
       EventTypeNames::mouseup, mev.InnerNode(), mev.CanvasRegionId(),
       mev.Event(), Vector<WebMouseEvent>());
 
   WebInputEventResult click_event_result =
-      mouse_event_manager_->DispatchMouseClickIfNeeded(mev, release_node);
+      mouse_release_target ? mouse_event_manager_->DispatchMouseClickIfNeeded(
+                                 mev, *mouse_release_target)
+                           : WebInputEventResult::kNotHandled;
 
   scroll_manager_->ClearResizeScrollableArea(false);
 
   if (event_result == WebInputEventResult::kNotHandled)
     event_result = mouse_event_manager_->HandleMouseReleaseEvent(mev);
   mouse_event_manager_->ClearDragHeuristicState();
 
   mouse_event_manager_->InvalidateClick();
 
   return EventHandlingUtil::MergeEventResult(click_event_result, event_result);
@@ skipping 1104 matching lines @@
     MouseEventWithHitTestResults& mev,
     LocalFrame* subframe) {
   WebInputEventResult result =
       subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
   if (result != WebInputEventResult::kNotHandled)
     return result;
   return WebInputEventResult::kHandledSystem;
 }
 
 }  // namespace blink