third_party/WebKit/Source/core/editing/serializers/Serialization.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/serializers/Serialization.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/editing/serializers/MarkupFormatter.cpp ('k') | third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

diff --git a/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp b/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

index 6b8dae386396225e91af06d687e941a6636c97cf..05927f51778e25f5be1f7e39525b49f730553a7b 100644

--- a/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

+++ b/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

@@ -291,7 +291,7 @@ static const char fragmentMarkerTag[] = "webkit-fragment-marker";

static bool findNodesSurroundingContext(DocumentFragment* fragment, RefPtrWillBeRawPtr<Comment>& nodeBeforeContext, RefPtrWillBeRawPtr<Comment>& nodeAfterContext)

{

for (Node& node : NodeTraversal::startsAt(fragment->firstChild())) {

- if (node.nodeType() == Node::COMMENT_NODE && toComment(node).data() == fragmentMarkerTag) {

+ if (node.getNodeType() == Node::COMMENT_NODE && toComment(node).data() == fragmentMarkerTag) {

if (!nodeBeforeContext) {

nodeBeforeContext = &toComment(node);

} else {