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

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: 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
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 26de5664a0ae380942d1bbbf6d78b3d8d6c6a11b..b3ee5d8f8c649767522a64c00fd3c18b5b21c597 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
@@ -210,7 +210,9 @@ CSSParserToken CSSTokenizer::semiColon(UChar cc) {
return CSSParserToken(SemicolonToken);
}
-CSSParserToken CSSTokenizer::hash(UChar cc) {
+/* 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) ||
twoCharsAreValidEscape(nextChar, m_input.peekWithoutReplacement(1))) {
@@ -309,7 +311,7 @@ CSSParserToken CSSTokenizer::nextToken() {
if (isASCII(cc)) {
SECURITY_DCHECK(cc < codePointsNumber);
- codePointFunc = codePoints[cc];
+ code_point_func = kCodePoints[cc];
} else {
codePointFunc = &CSSTokenizer::nameStart;
}

Powered by Google App Engine
This is Rietveld 408576698