Event.path should include Window

Source/core/events/TreeScopeEventContext.cpp

 /*
  * Copyright (C) 2014 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "config.h"
 #include "core/events/TreeScopeEventContext.h"
 
 #include "core/dom/StaticNodeList.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/EventPath.h"
 #include "core/events/TouchEventContext.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<StaticNodeList> TreeScopeEventContext::ensureEventPath(EventPath& path)
+Vector<RefPtrWillBeRawPtr<EventTarget>>& TreeScopeEventContext::ensureEventPath(EventPath& path)
 {
     if (m_eventPath)
-        return m_eventPath;
+        return *m_eventPath;
 
-    WillBeHeapVector<RefPtrWillBeMember<Node>> nodes;
-    nodes.reserveInitialCapacity(path.size());
+    LocalDOMWindow* window = path.windowEventContext().window();

[hayato, 2015/01/15 04:15:28]

Could you make sure that calling path.windowEventContext() is safe or not here?
I'm afraid that there is a case where path.windowEventContext() hits ASSERTION
if we don't call path.ensureWindowEventContext() here.

[kojii, 2015/01/15 06:56:44]

Done.

+    m_eventPath = adoptPtrWillBeNoop(new WillBeHeapVector<RefPtrWillBeRawPtr<EventTarget>>());
+    m_eventPath->reserveCapacity(path.size() + window ? 1 : 0);
     for (size_t i = 0; i < path.size(); ++i) {
         Node& rootNode = path[i].treeScopeEventContext().rootNode();
         if (rootNode.isShadowRoot() && toShadowRoot(rootNode).type() == ShadowRoot::AuthorShadowRoot)
-            nodes.append(path[i].node());
+            m_eventPath->append(path[i].node());
         else if (path[i].treeScopeEventContext().isInclusiveAncestorOf(*this))
-            nodes.append(path[i].node());
+            m_eventPath->append(path[i].node());
     }
-    m_eventPath = StaticNodeList::adopt(nodes);
-    return m_eventPath;
+    if (window)
+        m_eventPath->append(window);
+    return *m_eventPath;
 }
 
 TouchEventContext* TreeScopeEventContext::ensureTouchEventContext()
 {
     if (!m_touchEventContext)
         m_touchEventContext = TouchEventContext::create();
     return m_touchEventContext.get();
 }
 
 PassRefPtrWillBeRawPtr<TreeScopeEventContext> TreeScopeEventContext::create(TreeScope& treeScope)
@@ skipping 27 matching lines @@
 int TreeScopeEventContext::calculatePrePostOrderNumber(int orderNumber)
 {
     m_preOrder = orderNumber;
     for (size_t i = 0; i < m_children.size(); ++i)
         orderNumber = m_children[i]->calculatePrePostOrderNumber(orderNumber + 1);
     m_postOrder = orderNumber + 1;
     return orderNumber + 1;
 }
 
 }