third_party/WebKit/Source/core/css/parser/CSSTokenizer.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/css/parser/CSSTokenizer.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:

Index: third_party/WebKit/Source/core/css/parser/CSSTokenizer.h

diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.h b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.h

index a03d8d6cc4811d7bfeef208be5a714327c6e201e..395f678bec636ba991e6a45db8aa3438f633291b 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.h

+++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.h

@@ -82,7 +82,9 @@ class CORE_EXPORT CSSTokenizer {

CSSParserToken solidus(UChar);

CSSParserToken colon(UChar);

CSSParserToken semiColon(UChar);

- CSSParserToken hash(UChar);

+ /* DO NOT SUBMIT - Merge conflict resolution marker.

+ * Please spell |Hash| below (not |GetHash|). */

+ CSSParserToken Hash(UChar);

CSSParserToken circumflexAccent(UChar);

CSSParserToken dollarSign(UChar);

CSSParserToken verticalLine(UChar);