Make slots in non-shadow trees participate in a flat tree

third_party/WebKit/Source/core/dom/Node.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, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 975 matching lines @@
 // eliminate all the checks since those elements will never have class names,
 // inline style, or other things that this apparently guards against.
 bool Node::isStyledElement() const {
   return isHTMLElement() || isSVGElement() ||
          (isElementNode() &&
           toElement(this)->namespaceURI() == MathMLNames::mathmlNamespaceURI);
 }
 
 bool Node::canParticipateInFlatTree() const {
   // TODO(hayato): Return false for pseudo elements.
-  return !isShadowRoot() && !isSlotOrActiveInsertionPoint();
+  return !isShadowRoot() && !isActiveSlotOrActiveInsertionPoint();
 }
 
-bool Node::isSlotOrActiveInsertionPoint() const {
-  return isHTMLSlotElement(*this) || isActiveInsertionPoint(*this);
+bool Node::isActiveSlotOrActiveInsertionPoint() const {
+  return (isHTMLSlotElement(*this) &&
+          toHTMLSlotElement(*this).supportsDistribution()) ||
+         isActiveInsertionPoint(*this);
 }
 
 AtomicString Node::slotName() const {
   DCHECK(isSlotable());
   if (isElementNode())
     return HTMLSlotElement::normalizeSlotName(
         toElement(*this).fastGetAttribute(HTMLNames::slotAttr));
   DCHECK(isTextNode());
   return emptyAtom;
 }
@@ skipping 1474 matching lines @@
   if (node) {
     std::stringstream stream;
     node->printNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif