third_party/WebKit/Source/core/xml/XPathPath.cpp - Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/xml/XPathPath.cpp

Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-10: rebase Created 4 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/Source/core/svg/animation/SVGSMILElement.cpp ('k') | third_party/WebKit/Source/core/xml/XPathResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/xml/XPathPath.cpp

diff --git a/third_party/WebKit/Source/core/xml/XPathPath.cpp b/third_party/WebKit/Source/core/xml/XPathPath.cpp

index 554b4b765e6f122216f4b8148cc2d39f5f2482de..1894e0191a3f84a66e59b626836e0856253a4de0 100644

--- a/third_party/WebKit/Source/core/xml/XPathPath.cpp

+++ b/third_party/WebKit/Source/core/xml/XPathPath.cpp

@@ -134,14 +134,14 @@ void LocationPath::evaluate(EvaluationContext& context, NodeSet& nodes) const

NodeSet* newNodes = NodeSet::create();

WillBeHeapHashSet<RawPtrWillBeMember<Node>> newNodesSet;

- bool needToCheckForDuplicateNodes = !nodes.subtreesAreDisjoint() || (step->axis() != Step::ChildAxis && step->axis() != Step::SelfAxis

- && step->axis() != Step::DescendantAxis && step->axis() != Step::DescendantOrSelfAxis && step->axis() != Step::AttributeAxis);

+ bool needToCheckForDuplicateNodes = !nodes.subtreesAreDisjoint() || (step->getAxis() != Step::ChildAxis && step->getAxis() != Step::SelfAxis

+ && step->getAxis() != Step::DescendantAxis && step->getAxis() != Step::DescendantOrSelfAxis && step->getAxis() != Step::AttributeAxis);

if (needToCheckForDuplicateNodes)

resultIsSorted = false;

// This is a simplified check that can be improved to handle more cases.

- if (nodes.subtreesAreDisjoint() && (step->axis() == Step::ChildAxis || step->axis() == Step::SelfAxis))

+ if (nodes.subtreesAreDisjoint() && (step->getAxis() == Step::ChildAxis || step->getAxis() == Step::SelfAxis))

newNodes->markSubtreesDisjoint(true);

for (unsigned j = 0; j < nodes.size(); j++) {