[Refactoring] Remove include "core/inspector/InspectorInstrumentation.h" from SelectorChecker.h

Source/core/dom/SelectorQuery.cpp

 /*
  * Copyright (C) 2011 Apple Inc. 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 161 matching lines @@
     Vector<RefPtr<Node> > result;
     executeQueryAll(rootNode, result);
     return StaticNodeList::adopt(result);
 }
 
 PassRefPtr<Element> SelectorDataList::queryFirst(Node& rootNode) const
 {
     return executeQueryFirst(rootNode);
 }
 
+// FIXME: StyleSheetScopingNodeList also has isTreeScopeRoot.
+// Need to move TreeScope.h to remove duplicate functions.

[Hajime Morrita, 2013/11/18 05:02:52]

Let's do this in this change.

[tasak, 2013/11/18 05:45:56]

Done.

 static inline bool isTreeScopeRoot(Node* node)
 {
     ASSERT(node);
     return node->isDocumentNode() || node->isShadowRoot();
 }
 
 void SelectorDataList::collectElementsByClassName(Node& rootNode, const AtomicString& className, Vector<RefPtr<Node> >& traversalRoots) const
 {
     for (Element* element = ElementTraversal::firstWithin(rootNode); element; element = ElementTraversal::next(*element, &rootNode)) {
         if (element->hasClass() && element->classNames().contains(className))
@@ skipping 134 matching lines @@
     if (!firstSelector->tagHistory()) {
         // Fast path for querySelectorAll('#id'), querySelectorAl('.foo'), and querySelectorAll('div').
         switch (firstSelector->m_match) {
         case CSSSelector::Id:
             {
                 if (rootNode.document().containsMultipleElementsWithId(firstSelector->value()))
                     break;
 
                 // Just the same as getElementById.
                 Element* element = rootNode.treeScope().getElementById(firstSelector->value());
-                if (element && (isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))
+                if (element && (isTreeScopeRoot(&rootNode) || element->isDescendantOf(&rootNode)))
                     matchedElements.append(element);
                 return;
             }
         case CSSSelector::Class:
             return collectElementsByClassName(rootNode, firstSelector->value(), matchedElements);
         case CSSSelector::Tag:
             return collectElementsByTagName(rootNode, firstSelector->tagQName(), matchedElements);
         default:
             break; // If we need another fast path, add here.
         }
@@ skipping 38 matching lines @@
     // we would need to sort the results. For now, just traverse the document in that case.
     ASSERT(m_selectors.size() == 1);
     ASSERT(m_selectors[0].selector);
 
     bool matchSingleNode = true;
     bool startFromParent = false;
     for (const CSSSelector* selector = m_selectors[0].selector; selector; selector = selector->tagHistory()) {
         if (selector->m_match == CSSSelector::Id && !rootNode.document().containsMultipleElementsWithId(selector->value())) {
             Element* element = rootNode.treeScope().getElementById(selector->value());
             Node* adjustedRootNode = &rootNode;
-            if (element && (isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))
+            if (element && (isTreeScopeRoot(&rootNode) || element->isDescendantOf(&rootNode)))
                 adjustedRootNode = element;
             else if (!element || matchSingleNode)
                 adjustedRootNode = 0;
             if (matchSingleNode) {
                 matchTraverseRoot = true;
                 return adjustedRootNode;
             }
             if (startFromParent && adjustedRootNode)
                 adjustedRootNode = adjustedRootNode->parentNode();
             matchTraverseRoot = false;
@@ skipping 33 matching lines @@
 
     if (!selector->tagHistory()) {
         // Fast path for querySelector('#id'), querySelector('.foo'), and querySelector('div').
         // Many web developers uses querySelector with these simple selectors.
         switch (selector->m_match) {
         case CSSSelector::Id:
             {
                 if (rootNode.document().containsMultipleElementsWithId(selector->value()))
                     break;
                 Element* element = rootNode.treeScope().getElementById(selector->value());
-                return element && (isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)) ? element : 0;
+                return element && (isTreeScopeRoot(&rootNode) || element->isDescendantOf(&rootNode)) ? element : 0;
             }
         case CSSSelector::Class:
             return findElementByClassName(rootNode, selector->value());
         case CSSSelector::Tag:
             return findElementByTagName(rootNode, selector->tagQName());
         default:
             break; // If we need another fast path, add here.
         }
     }
 
@@ skipping 66 matching lines @@
     m_entries.add(selectors, selectorQuery.release());
     return rawSelectorQuery;
 }
 
 void SelectorQueryCache::invalidate()
 {
     m_entries.clear();
 }
 
 }