Merge SelectorDataList into SelectorQuery.

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

 /*
  * 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 27 matching lines @@
 
 class CSSSelector;
 class ContainerNode;
 class Document;
 class Element;
 class ExceptionState;
 template <typename NodeType>
 class StaticNodeTypeList;
 using StaticElementList = StaticNodeTypeList<Element>;
 
-class SelectorDataList {
-  DISALLOW_NEW();
+class CORE_EXPORT SelectorQuery {
+  WTF_MAKE_NONCOPYABLE(SelectorQuery);
+  USING_FAST_MALLOC(SelectorQuery);
 
  public:
-  void initialize(const CSSSelectorList&);
+  static std::unique_ptr<SelectorQuery> adopt(CSSSelectorList);
+
+  // https://dom.spec.whatwg.org/#dom-element-matches
   bool matches(Element&) const;
+
+  // https://dom.spec.whatwg.org/#dom-element-closest
   Element* closest(Element&) const;
+
+  // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall
   StaticElementList* queryAll(ContainerNode& rootNode) const;
+
+  // https://dom.spec.whatwg.org/#dom-parentnode-queryselector
   Element* queryFirst(ContainerNode& rootNode) const;
 
  private:
+  explicit SelectorQuery(CSSSelectorList);
+
   bool canUseFastQuery(const ContainerNode& rootNode) const;
-  bool selectorMatches(const CSSSelector&,
-                       Element&,
-                       const ContainerNode&) const;
-
-  template <typename SelectorQueryTrait>
-  void collectElementsByClassName(
-      ContainerNode& rootNode,
-      const AtomicString& className,
-      typename SelectorQueryTrait::OutputType&) const;
-  template <typename SelectorQueryTrait>
-  void collectElementsByTagName(ContainerNode& rootNode,
-                                const QualifiedName& tagName,
-                                typename SelectorQueryTrait::OutputType&) const;
 
   template <typename SelectorQueryTrait>
   void findTraverseRootsAndExecute(
       ContainerNode& rootNode,
       typename SelectorQueryTrait::OutputType&) const;
 
   enum MatchTraverseRootState {
     DoesNotMatchTraverseRoots,
     MatchesTraverseRoots
   };
@@ skipping 18 matching lines @@
   void executeSlow(ContainerNode& rootNode,
                    typename SelectorQueryTrait::OutputType&) const;
   template <typename SelectorQueryTrait>
   void executeSlowTraversingShadowTree(
       ContainerNode& rootNode,
       typename SelectorQueryTrait::OutputType&) const;
   template <typename SelectorQueryTrait>
   void execute(ContainerNode& rootNode,
                typename SelectorQueryTrait::OutputType&) const;
 
+  CSSSelectorList m_selectorList;
   Vector<const CSSSelector*> m_selectors;
   bool m_usesDeepCombinatorOrShadowPseudo : 1;
   bool m_needsUpdatedDistribution : 1;
 };
 
-class CORE_EXPORT SelectorQuery {
-  WTF_MAKE_NONCOPYABLE(SelectorQuery);
-  USING_FAST_MALLOC(SelectorQuery);
-
- public:
-  static std::unique_ptr<SelectorQuery> adopt(CSSSelectorList);
-
-  bool matches(Element&) const;
-  Element* closest(Element&) const;
-  StaticElementList* queryAll(ContainerNode& rootNode) const;
-  Element* queryFirst(ContainerNode& rootNode) const;
-
- private:
-  explicit SelectorQuery(CSSSelectorList);
-
-  SelectorDataList m_selectors;
-  CSSSelectorList m_selectorList;
-};
-
 class SelectorQueryCache {
   USING_FAST_MALLOC(SelectorQueryCache);
 
  public:
   SelectorQuery* add(const AtomicString&, const Document&, ExceptionState&);
   void invalidate();
 
  private:
   HashMap<AtomicString, std::unique_ptr<SelectorQuery>> m_entries;
 };
 
 }  // namespace blink
 
 #endif