Revert of Support slot element's fallback content feature

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/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 950 matching lines @@
 bool Node::canParticipateInComposedTree() const
 {
     return !isShadowRoot() && !isSlotOrActiveInsertionPoint();
 }
 
 bool Node::isSlotOrActiveInsertionPoint() const
 {
     return isHTMLSlotElement(*this) || isActiveInsertionPoint(*this);
 }
 
-bool Node::isInV1ShadowTree() const
-{
-    ShadowRoot* shadowRoot = containingShadowRoot();
-    return shadowRoot && shadowRoot->isV1();
-}
-
-bool Node::isInV0ShadowTree() const
-{
-    ShadowRoot* shadowRoot = containingShadowRoot();
-    return shadowRoot && !shadowRoot->isV1();
-}
-
-static ElementShadow* parentElementShadow(const Node& node)
-{
-    Element* parent = node.parentElement();
-    if (!parent)
-        return nullptr;
-    return parent->shadow();
-}
-
-bool Node::isChildOfV1ShadowHost() const
-{
-    ElementShadow* parentShadow = parentElementShadow(*this);
-    return parentShadow && parentShadow->isV1();
-}
-
-bool Node::isChildOfV0ShadowHost() const
-{
-    ElementShadow* parentShadow = parentElementShadow(*this);
-    return parentShadow && !parentShadow->isV1();
-}
-
 Element* Node::shadowHost() const
 {
     if (ShadowRoot* root = containingShadowRoot())
         return root->host();
     return nullptr;
 }
 
 ShadowRoot* Node::containingShadowRoot() const
 {
     Node& root = treeScope().rootNode();
@@ skipping 1223 matching lines @@
         if (!insertionPoint->containingShadowRoot()->isOpen())
             break;
         filteredInsertionPoints.append(insertionPoint);
     }
     return StaticNodeList::adopt(filteredInsertionPoints);
 }
 
 HTMLSlotElement* Node::assignedSlot() const
 {
     ASSERT(!needsDistributionRecalc());
-    if (ElementShadow* shadow = parentElementShadow(*this))
-        return shadow->assignedSlotFor(*this);
-    return nullptr;
-}
-
-HTMLSlotElement* Node::assignedSlotForBinding()
-{
-    updateDistribution();
-    if (ElementShadow* shadow = parentElementShadow(*this)) {
+    Element* parent = parentElement();
+    if (!parent)
+        return nullptr;
+    if (ElementShadow* shadow = parent->shadow()) {
         if (shadow->isV1() && shadow->isOpen())
             return shadow->assignedSlotFor(*this);
     }
     return nullptr;
 }
 
 void Node::setFocus(bool flag)
 {
     document().userActionElements().setFocused(this, flag);
 }
@@ skipping 141 matching lines @@
 
 void showNodePath(const blink::Node* node)
 {
     if (node)
         node->showNodePathForThis();
     else
         fprintf(stderr, "Cannot showNodePath for (nil)\n");
 }
 
 #endif