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

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 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3

Patch Set: get-names-4: 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

« third_party/WebKit/Source/core/dom/Node.h ('K') | « third_party/WebKit/Source/core/xml/XPathFunctions.cpp ('k') | third_party/WebKit/Source/core/xml/XPathStep.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 bafecad8d28f6c687da40aa381659d6af2eac5bc..554b4b765e6f122216f4b8148cc2d39f5f2482de 100644

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

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

@@ -111,7 +111,7 @@ Value LocationPath::evaluate(EvaluationContext& evaluationContext) const

// This is for compatibility with Firefox, and also seems like a more

// logical treatment of where you would expect the "root" to be.

Node* context = evaluationContext.node.get();

- if (m_absolute && context->nodeType() != Node::DOCUMENT_NODE) {

+ if (m_absolute && context->getNodeType() != Node::DOCUMENT_NODE) {

if (context->inDocument())

context = context->ownerDocument();

else