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

Side by Side Diff: Source/core/xml/XPathNodeSet.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/xml/XPathExpression.cpp ('k') | Source/core/xml/XPathStep.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 sortedNodes.append(parentMatrix[i][0]); 175 sortedNodes.append(parentMatrix[i][0]);
176 176
177 const_cast<Vector<RefPtr<Node> >&>(m_nodes).swap(sortedNodes); 177 const_cast<Vector<RefPtr<Node> >&>(m_nodes).swap(sortedNodes);
178 } 178 }
179 179
180 static Node* findRootNode(Node* node) 180 static Node* findRootNode(Node* node)
181 { 181 {
182 if (node->isAttributeNode()) 182 if (node->isAttributeNode())
183 node = toAttr(node)->ownerElement(); 183 node = toAttr(node)->ownerElement();
184 if (node->inDocument()) 184 if (node->inDocument())
185 node = node->document(); 185 node = &node->document();
186 else { 186 else {
187 while (Node* parent = node->parentNode()) 187 while (Node* parent = node->parentNode())
188 node = parent; 188 node = parent;
189 } 189 }
190 return node; 190 return node;
191 } 191 }
192 192
193 void NodeSet::traversalSort() const 193 void NodeSet::traversalSort() const
194 { 194 {
195 HashSet<Node*> nodes; 195 HashSet<Node*> nodes;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 Node* NodeSet::anyNode() const 256 Node* NodeSet::anyNode() const
257 { 257 {
258 if (isEmpty()) 258 if (isEmpty())
259 return 0; 259 return 0;
260 260
261 return m_nodes.at(0).get(); 261 return m_nodes.at(0).get();
262 } 262 }
263 263
264 } 264 }
265 } 265 }
OLDNEW
« no previous file with comments | « Source/core/xml/XPathExpression.cpp ('k') | Source/core/xml/XPathStep.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698