third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

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/MarkupAccumulator.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: Rebasing the fixes... Created 3 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h ('k') | third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h

diff --git a/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h b/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h

index c99c49fa1c92fb1bf9b70437c59158871ddf2d1b..ea411c48dabe8ac2c480f7839382fd71650f1e57 100644

--- a/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h

+++ b/third_party/WebKit/Source/core/editing/serializers/MarkupAccumulator.h

@@ -82,7 +82,8 @@ class MarkupAccumulator {

template <typename Strategy>

String serializeNodes(MarkupAccumulator&, Node&, EChildrenOnly);

-extern template String serializeNodes<EditingStrategy>(MarkupAccumulator&,

+// DO NOT SUBMIT - conflict marker - please spell |SerializeNodes| below.

+extern template String SerializeNodes<EditingStrategy>(MarkupAccumulator&,

Node&,

EChildrenOnly);