Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Unified Diff: third_party/WebKit/WebCore/xml/XPathResult.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/xml/XPathExpression.cpp ('k') | third_party/WebKit/WebCore/xml/XPathResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/xml/XPathResult.h
===================================================================
--- third_party/WebKit/WebCore/xml/XPathResult.h (revision 9383)
+++ 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(Node* eventTarget, const XPath::Value& value) { return adoptRef(new XPathResult(eventTarget, value)); }
+ static PassRefPtr<XPathResult> create(EventTargetNode* 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(Node*, const XPath::Value&);
+ XPathResult(EventTargetNode*, 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<Node> m_eventTarget;
+ RefPtr<EventTargetNode> m_eventTarget;
RefPtr<EventListener> m_eventListener;
};
« no previous file with comments | « third_party/WebKit/WebCore/xml/XPathExpression.cpp ('k') | third_party/WebKit/WebCore/xml/XPathResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698