WebKit merge 40668:40722 part 1.

third_party/WebKit/WebCore/xml/XPathResult.h

Index: third_party/WebKit/WebCore/xml/XPathResult.h
===================================================================
--- third_party/WebKit/WebCore/xml/XPathResult.h	(revision 9310)
+++ third_party/WebKit/WebCore/xml/XPathResult.h	(working copy)
@@ -37,8 +37,8 @@
     typedef int ExceptionCode;
 
     class EventListener;
-    class EventTargetNode;
     class Node;
+    class Node;
     class String;
 
     class XPathResult : public RefCounted<XPathResult> {
@@ -56,7 +56,7 @@
             FIRST_ORDERED_NODE_TYPE = 9
         };
         
-        static PassRefPtr<XPathResult> create(EventTargetNode* eventTarget, const XPath::Value& value) { return adoptRef(new XPathResult(eventTarget, value)); }
+        static PassRefPtr<XPathResult> create(Node* eventTarget, const XPath::Value& value) { return adoptRef(new XPathResult(eventTarget, value)); }
         ~XPathResult();
         
         void convertTo(unsigned short type, ExceptionCode&);
@@ -76,14 +76,14 @@
         void invalidateIteratorState();
 
     private:
-        XPathResult(EventTargetNode*, const XPath::Value&);
+        XPathResult(Node*, const XPath::Value&);
         
         XPath::Value m_value;
         unsigned m_nodeSetPosition;
         XPath::NodeSet m_nodeSet; // FIXME: why duplicate the node set stored in m_value?
         unsigned short m_resultType;
         bool m_invalidIteratorState;
-        RefPtr<EventTargetNode> m_eventTarget;
+        RefPtr<Node> m_eventTarget;
         RefPtr<EventListener> m_eventListener;
     };