Allow display:contents elements in hover chain.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1114 matching lines @@
   if (isElementNode() && toElement(this)->childrenOrSiblingsAffectedByDrag())
     toElement(this)->pseudoStateChanged(CSSSelector::PseudoDrag);
 }
 
 void ContainerNode::setHovered(bool over) {
   if (over == isHovered())
     return;
 
   Node::setHovered(over);
 
-  // If :hover sets display: none we lose our hover but still need to recalc our
-  // style.
-  if (!layoutObject()) {
-    if (over)
-      return;
-    if (isElementNode() && toElement(this)->childrenOrSiblingsAffectedByHover())
-      toElement(this)->pseudoStateChanged(CSSSelector::PseudoHover);
-    else
-      setNeedsStyleRecalc(
-          LocalStyleChange,
-          StyleChangeReasonForTracing::createWithExtraData(
-              StyleChangeReason::PseudoClass, StyleChangeExtraData::Hover));
-    return;
-  }
-
-  if (computedStyle()->affectedByHover()) {
-    StyleChangeType changeType =
-        computedStyle()->hasPseudoStyle(PseudoIdFirstLetter)
-            ? SubtreeStyleChange
-            : LocalStyleChange;
+  const ComputedStyle* style = computedStyle();
+  if (!style || style->affectedByHover()) {
+    StyleChangeType changeType = LocalStyleChange;
+    if (style && style->hasPseudoStyle(PseudoIdFirstLetter))
+      changeType = SubtreeStyleChange;
     setNeedsStyleRecalc(
         changeType,
         StyleChangeReasonForTracing::createWithExtraData(
             StyleChangeReason::PseudoClass, StyleChangeExtraData::Hover));
   }
   if (isElementNode() && toElement(this)->childrenOrSiblingsAffectedByHover())
     toElement(this)->pseudoStateChanged(CSSSelector::PseudoHover);
 
-  LayoutTheme::theme().controlStateChanged(*layoutObject(), HoverControlState);
+  if (layoutObject()) {
+    LayoutTheme::theme().controlStateChanged(*layoutObject(),
+                                             HoverControlState);
+  }
 }
 
 HTMLCollection* ContainerNode::children() {
   return ensureCachedCollection<HTMLCollection>(NodeChildren);
 }
 
 unsigned ContainerNode::countChildren() const {
   unsigned count = 0;
   for (Node* node = firstChild(); node; node = node->nextSibling())
     count++;
@@ skipping 313 matching lines @@
     return true;
 
   if (node->isElementNode() && toElement(node)->shadow())
     return true;
 
   return false;
 }
 #endif
 
 }  // namespace blink