third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.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/editing/iterators/SimplifiedBackwardsTextIterator.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/shadow/ShadowRoot.cpp ('k') | third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp

diff --git a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp

index d18b40333873ffd79331588b2c6786a1e14d8758..4fe31d26b189cbd0ea1603cba9afe43225158b5a 100644

--- a/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp

+++ b/third_party/WebKit/Source/core/editing/iterators/SimplifiedBackwardsTextIterator.cpp

@@ -154,7 +154,7 @@ void SimplifiedBackwardsTextIteratorAlgorithm<Strategy>::advance()

// Don't handle node if we start iterating at [node, 0].

if (!m_handledNode && !(m_node == m_endNode && !m_endOffset)) {

LayoutObject* layoutObject = m_node->layoutObject();

- if (layoutObject && layoutObject->isText() && m_node->nodeType() == Node::TEXT_NODE) {

+ if (layoutObject && layoutObject->isText() && m_node->getNodeType() == Node::TEXT_NODE) {

// FIXME: What about CDATA_SECTION_NODE?

if (layoutObject->style()->visibility() == VISIBLE && m_offset > 0)

m_handledNode = handleTextNode();