Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
diff --git a/Source/core/css/CSSTokenizer.h b/Source/core/css/CSSTokenizer.h
index 05b319c..5d8fae1 100644
--- a/Source/core/css/CSSTokenizer.h
+++ b/Source/core/css/CSSTokenizer.h
@@ -29,7 +29,7 @@
namespace WebCore {
-class CSSParser;
+class BisonCSSParser;
struct CSSParserLocation;
struct CSSParserString;
@@ -37,9 +37,9 @@
WTF_MAKE_NONCOPYABLE(CSSTokenizer);
public:
// FIXME: This should not be needed but there are still some ties between the 2 classes.
- friend class CSSParser;
+ friend class BisonCSSParser;
- CSSTokenizer(CSSParser& parser)
+ CSSTokenizer(BisonCSSParser& parser)
: m_parser(parser)
, m_parsedTextPrefixLength(0)
, m_parsedTextSuffixLength(0)
@@ -133,13 +133,11 @@
inline void detectAtToken(int, bool);
template <typename CharacterType>
inline void detectSupportsToken(int);
- template <typename CharacterType>
- inline void detectCSSVariableDefinitionToken(int);
template <typename SourceCharacterType>
int realLex(void* yylval);
- CSSParser& m_parser;
+ BisonCSSParser& m_parser;
size_t m_parsedTextPrefixLength;
size_t m_parsedTextSuffixLength;