third_party/WebKit/Source/core/dom/NodeIteratorBase.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/dom/NodeIteratorBase.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/dom/Node.idl ('k') | third_party/WebKit/Source/core/dom/ProcessingInstruction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp

diff --git a/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp b/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp

index 9b4d30ab054dcc45356be48c01bd399b9e884e19..bcb45b16d872a418b67e944254d168c86d68951f 100644

--- a/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp

+++ b/third_party/WebKit/Source/core/dom/NodeIteratorBase.cpp

@@ -43,7 +43,7 @@ unsigned NodeIteratorBase::acceptNode(Node* node, ExceptionState& exceptionState

{

// The bit twiddling here is done to map DOM node types, which are given as integers from

// 1 through 14, to whatToShow bit masks.

- if (!(((1 << (node->nodeType() - 1)) & m_whatToShow)))

+ if (!(((1 << (node->getNodeType() - 1)) & m_whatToShow)))

return NodeFilter::FILTER_SKIP;

if (!m_filter)

return NodeFilter::FILTER_ACCEPT;