third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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/platform/text/DateTimeFormatTest.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/platform/fonts/FontDescription.h ('K') | « third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm ('k') | third_party/WebKit/Source/platform/text/PlatformLocale.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp

diff --git a/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp b/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp

index 1a3f8e2ca5e4426cb82418451a42e1957fcb00c0..f1dd12223da45b58d1b62869a7fccb1213d7ca9d 100644

--- a/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp

+++ b/third_party/WebKit/Source/platform/text/DateTimeFormatTest.cpp

@@ -191,7 +191,7 @@ private:

return index >=0 && index < static_cast<int>(m_tokens.size()) ? m_tokens[index].fieldType : DateTimeFormat::FieldTypeInvalid;

}

- Tokens tokens() const { return Tokens(m_tokens); }

+ Tokens getTokens() const { return Tokens(m_tokens); }

private:

void visitField(FieldType fieldType, int count) override