Chromium Code Reviews| 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..6a9ae43ed668075c5dea1f480d0b279f927eaed7 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) |
|
esprehn
2016/06/27 22:16:18
I merged this into the function so I don't need a
|
| -{ |
| - 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() == type) { |
| + m_blockStack.removeLast(); |
| return CSSParserToken(type, CSSParserToken::BlockEnd); |
| + } |
| return CSSParserToken(type); |
| } |