Remove isTreeScopeRoot.

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

 /*
  * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Samsung Electronics. 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.
@@ skipping 232 matching lines @@
   bool startFromParent = false;
 
   for (const CSSSelector* selector = m_selectors[0]; selector;
        selector = selector->tagHistory()) {
     if (selector->match() == CSSSelector::Id && rootNode.isInTreeScope() &&
         !rootNode.containingTreeScope().containsMultipleElementsWithId(
             selector->value())) {
       Element* element =
           rootNode.containingTreeScope().getElementById(selector->value());
       ContainerNode* adjustedNode = &rootNode;
-      if (element &&
-          (isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))
+      if (element && element->isDescendantOf(&rootNode))
         adjustedNode = element;
       else if (!element || isRightmostSelector)
         adjustedNode = nullptr;
       if (isRightmostSelector) {
         if (!adjustedNode)
           return;
         element = toElement(adjustedNode);
         if (selectorMatches(*m_selectors[0], *element, rootNode))
           SelectorQueryTrait::appendElement(output, *element);
         return;
@@ skipping 237 matching lines @@
   const CSSSelector& firstSelector = selector;
 
   // Fast path for querySelector*('#id'), querySelector*('tag#id'),
   // querySelector*('tag[id=example]').
   if (const CSSSelector* idSelector = selectorForIdLookup(firstSelector)) {
     const AtomicString& idToMatch = idSelector->value();
     if (rootNode.treeScope().containsMultipleElementsWithId(idToMatch)) {
       const HeapVector<Member<Element>>& elements =
           rootNode.treeScope().getAllElementsById(idToMatch);
       for (const auto& element : elements) {
-        if (!(isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))
+        if (!element->isDescendantOf(&rootNode))
           continue;
         if (selectorMatches(selector, *element, rootNode)) {
           SelectorQueryTrait::appendElement(output, *element);
           if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
             return;
         }
       }
       return;
     }
     Element* element = rootNode.treeScope().getElementById(idToMatch);
-    if (!element ||
-        !(isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))
+    if (!element)
+      return;
+    if (!element->isDescendantOf(&rootNode))
       return;
     if (selectorMatches(selector, *element, rootNode))
       SelectorQueryTrait::appendElement(output, *element);
     return;
   }
 
   if (!firstSelector.tagHistory()) {
     // Fast path for querySelector*('.foo'), and querySelector*('div').
     switch (firstSelector.match()) {
       case CSSSelector::Class:
@@ skipping 72 matching lines @@
   return m_entries
       .insert(selectors, SelectorQuery::adopt(std::move(selectorList)))
       .storedValue->value.get();
 }
 
 void SelectorQueryCache::invalidate() {
   m_entries.clear();
 }
 
 }  // namespace blink