| 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 9a8075e707f9a94ee415539a3cade2ec853efe23..3e956ab67a9ad0768bdcea3a31ce49389ccb05ec 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| @@ -125,15 +125,6 @@ CSSParserToken CSSTokenizer::whiteSpace(UChar cc)
|
| return CSSParserToken(WhitespaceToken);
|
| }
|
|
|
| -static bool popIfBlockMatches(Vector<CSSParserTokenType>& blockStack, CSSParserTokenType type)
|
| -{
|
| - if (!blockStack.isEmpty() && blockStack.last() == type) {
|
| - blockStack.removeLast();
|
| - return true;
|
| - }
|
| - return false;
|
| -}
|
| -
|
| CSSParserToken CSSTokenizer::blockStart(CSSParserTokenType type)
|
| {
|
| m_blockStack.append(type);
|
| @@ -148,8 +139,10 @@ CSSParserToken CSSTokenizer::blockStart(CSSParserTokenType blockType, CSSParserT
|
|
|
| CSSParserToken CSSTokenizer::blockEnd(CSSParserTokenType type, CSSParserTokenType startType)
|
| {
|
| - if (popIfBlockMatches(m_blockStack, startType))
|
| + if (!m_blockStack.isEmpty() && m_blockStack.last() == startType) {
|
| + m_blockStack.removeLast();
|
| return CSSParserToken(type, CSSParserToken::BlockEnd);
|
| + }
|
| return CSSParserToken(type);
|
| }
|
|
|
|
|