Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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
Index: third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
index 4a4b6680167b5761e5f263bef473ba5f2a8a047e..982e098a7733f1a9381547451514de91174b5397 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
@@ -210,6 +210,8 @@ CSSParserToken CSSTokenizer::semiColon(UChar cc) {
return CSSParserToken(SemicolonToken);
}
+/* DO NOT SUBMIT - Merge conflict resolution marker.
+ * Please spell |Hash| below (not |GetHash|). */
CSSParserToken CSSTokenizer::hash(UChar cc) {
UChar nextChar = m_input.peekWithoutReplacement(0);
if (isNameCodePoint(nextChar) ||

Powered by Google App Engine
This is Rietveld 408576698