Allow display:contents elements in hover chain.

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 3929 matching lines @@
 
   // We can't be focused if we're not in the document.
   if (!node->isConnected())
     return;
   bool contains =
       node->isShadowIncludingInclusiveAncestorOf(m_focusedElement.get());
   if (contains && (m_focusedElement != node || !amongChildrenOnly))
     clearFocusedElement();
 }
 
+static Node* skipDisplayNoneAncestors(Node* node) {
+  while (node) {
+    if (node->layoutObject())
+      return node;
+    if (node->isElementNode() && toElement(node)->hasDisplayContentsStyle())
+      return node;
+    node = FlatTreeTraversal::parent(*node);
+  }
+  return nullptr;
+}
+
 void Document::hoveredNodeDetached(Element& element) {
   if (!m_hoverNode)
     return;
 
   m_hoverNode->updateDistribution();
   if (element != m_hoverNode &&
       (!m_hoverNode->isTextNode() ||
        element != FlatTreeTraversal::parent(*m_hoverNode)))
     return;
 
-  m_hoverNode = FlatTreeTraversal::parent(element);
-  while (m_hoverNode && !m_hoverNode->layoutObject())
-    m_hoverNode = FlatTreeTraversal::parent(*m_hoverNode);
+  m_hoverNode = skipDisplayNoneAncestors(&element);
 
   // If the mouse cursor is not visible, do not clear existing
   // hover effects on the ancestors of |element| and do not invoke
   // new hover effects on any other element.
   if (!page()->isCursorVisible())
     return;
 
   if (frame())
     frame()->eventHandler().scheduleHoverStateUpdate();
 }
 
 void Document::activeChainNodeDetached(Element& element) {
   if (!m_activeHoverElement)
     return;
 
   if (element != m_activeHoverElement)
     return;
 
-  Node* activeNode = FlatTreeTraversal::parent(element);
-  while (activeNode && activeNode->isElementNode() &&
-         !activeNode->layoutObject())
-    activeNode = FlatTreeTraversal::parent(*activeNode);
-
+  Node* activeNode = skipDisplayNoneAncestors(&element);
   m_activeHoverElement = activeNode && activeNode->isElementNode()
                              ? toElement(activeNode)
                              : nullptr;
 }
 
 const Vector<AnnotatedRegionValue>& Document::annotatedRegions() const {
   return m_annotatedRegions;
 }
 
 void Document::setAnnotatedRegions(
@@ skipping 2207 matching lines @@
   // only those) nodes should remain :active until the mouse is released.
   bool allowActiveChanges = !oldActiveElement && activeHoverElement();
 
   // If the mouse is down and if this is a mouse move event, we want to restrict
   // changes in :hover/:active to only apply to elements that are in the :active
   // chain that we froze at the time the mouse went down.
   bool mustBeInActiveChain = request.active() && request.move();
 
   Node* oldHoverNode = hoverNode();
 
-  // Check to see if the hovered node has changed.
-  // If it hasn't, we do not need to do anything.
-  Node* newHoverNode = innerElementInDocument;
-  while (newHoverNode && !newHoverNode->layoutObject())
-    newHoverNode = newHoverNode->parentOrShadowHostNode();
+  // The passed in innerElement may not be a result of a hit test for the
+  // current up-to-date flat/layout tree. That means the element may be
+  // display:none at this point. Skip up the ancestor chain until we reach an
+  // element with a layoutObject or a display:contents element.
+  Node* newHoverNode = skipDisplayNoneAncestors(innerElementInDocument);
 
   // Update our current hover node.
   setHoverNode(newHoverNode);
 
   Node* ancestor =
       (oldHoverNode && oldHoverNode->isConnected() && newHoverNode)
           ? FlatTreeTraversal::commonAncestor(*oldHoverNode, *newHoverNode)
           : nullptr;
 
   HeapVector<Member<Node>, 32> nodesToRemoveFromChain;
@@ skipping 400 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif