| 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;
|
| }
|
|
|