Remove Event.relatedTargetScoped and update event path calculation for relatedTarget

third_party/WebKit/Source/core/events/EventPath.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 240 matching lines @@
 
 void EventPath::adjustForRelatedTarget(Node& target, EventTarget* relatedTarget)
 {
     if (!relatedTarget)
         return;
     Node* relatedNode = relatedTarget->toNode();
     if (!relatedNode)
         return;
     if (target.document() != relatedNode->document())
         return;
-    if (!target.inShadowIncludingDocument() || !relatedNode->inShadowIncludingDocument())
-        return;
+    retargetRelatedTarget(*relatedNode);
+    shrinkForRelatedTarget(target, *relatedNode);
+}
 
+void EventPath::retargetRelatedTarget(const Node& relatedTargetNode)
+{
     RelatedTargetMap relatedNodeMap;
-    buildRelatedNodeMap(*relatedNode, relatedNodeMap);
+    buildRelatedNodeMap(relatedTargetNode, relatedNodeMap);
 
     for (const auto& treeScopeEventContext : m_treeScopeEventContexts) {
+

[tkent, 2016/06/02 04:38:00]

nit: This blank line doesn't look helpful to me.

[hayato, 2016/06/02 04:47:44]

Done

         EventTarget* adjustedRelatedTarget = findRelatedNode(treeScopeEventContext->treeScope(), relatedNodeMap);
         ASSERT(adjustedRelatedTarget);
         treeScopeEventContext.get()->setRelatedTarget(adjustedRelatedTarget);
     }
-
-    shrinkIfNeeded(target, *relatedTarget);
 }
 
-void EventPath::shrinkIfNeeded(const Node& target, const EventTarget& relatedTarget)
+void EventPath::shrinkForRelatedTarget(const Node& target, const Node& relatedTarget)
 {
-    // Synthetic mouse events can have a relatedTarget which is identical to the target.
-    bool targetIsIdenticalToToRelatedTarget = (&target == &relatedTarget);
-
+    if (!target.isInShadowTree() && !relatedTarget.isInShadowTree())
+        return;
     for (size_t i = 0; i < size(); ++i) {
-        if (targetIsIdenticalToToRelatedTarget) {
-            if (target.treeScope().rootNode() == at(i).node()) {
-                shrink(i + 1);
-                break;
-            }
-        } else if (at(i).target() == at(i).relatedTarget()) {
+        if (at(i).target() == at(i).relatedTarget()) {
             // Event dispatching should be stopped here.
             shrink(i);
             break;
         }
     }
 }
 
 void EventPath::adjustForTouchEvent(TouchEvent& touchEvent)
 {
     HeapVector<Member<TouchList>> adjustedTouches;
@@ skipping 69 matching lines @@
 DEFINE_TRACE(EventPath)
 {
     visitor->trace(m_nodeEventContexts);
     visitor->trace(m_node);
     visitor->trace(m_event);
     visitor->trace(m_treeScopeEventContexts);
     visitor->trace(m_windowEventContext);
 }
 
 } // namespace blink