third_party/WebKit/Source/core/xml/XPathStep.h - 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/XPathStep.h

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

Index: third_party/WebKit/Source/core/xml/XPathStep.h

diff --git a/third_party/WebKit/Source/core/xml/XPathStep.h b/third_party/WebKit/Source/core/xml/XPathStep.h

index 8bd423ca8521a898ca6441150fd53acc07c5db3f..cb17248cdc393869767c21890535178f425612ec 100644

--- a/third_party/WebKit/Source/core/xml/XPathStep.h

+++ b/third_party/WebKit/Source/core/xml/XPathStep.h

@@ -76,7 +76,7 @@ public:

}

DEFINE_INLINE_TRACE() { visitor->trace(m_mergedPredicates); }

- Kind kind() const { return m_kind; }

+ Kind getKind() const { return m_kind; }

const AtomicString& data() const { return m_data; }

const AtomicString& namespaceURI() const { return m_namespaceURI; }

HeapVector<Member<Predicate>>& mergedPredicates() { return m_mergedPredicates; }

@@ -100,7 +100,7 @@ public:

void evaluate(EvaluationContext&, Node* context, NodeSet&) const;

- Axis axis() const { return m_axis; }

+ Axis getAxis() const { return m_axis; }

const NodeTest& nodeTest() const { return *m_nodeTest; }

private:

« no previous file with comments | « third_party/WebKit/Source/core/xml/XPathResult.cpp ('k') | third_party/WebKit/Source/core/xml/XPathStep.cpp » ('j') | no next file with comments »