| Index: sky/engine/core/html/parser/HTMLTokenizer.h
|
| diff --git a/sky/engine/core/html/parser/HTMLTokenizer.h b/sky/engine/core/html/parser/HTMLTokenizer.h
|
| index 302b6482e1c2b58500599708fd350a23f3fb2b14..a22cf50df65ecf530b9d1f0b6ea2b889945ebcdc 100644
|
| --- a/sky/engine/core/html/parser/HTMLTokenizer.h
|
| +++ b/sky/engine/core/html/parser/HTMLTokenizer.h
|
| @@ -27,6 +27,7 @@
|
| #ifndef HTMLTokenizer_h
|
| #define HTMLTokenizer_h
|
|
|
| +#include "core/html/parser/HTMLEntityParser.h"
|
| #include "core/html/parser/HTMLToken.h"
|
| #include "core/html/parser/InputStreamPreprocessor.h"
|
| #include "platform/text/SegmentedString.h"
|
| @@ -45,6 +46,7 @@ public:
|
| enum State {
|
| DataState,
|
| CharacterReferenceInDataState,
|
| + CharacterReferenceInAttributeValueState,
|
| RAWTEXTState,
|
| TagOpenState,
|
| EndTagOpenState,
|
| @@ -59,7 +61,6 @@ public:
|
| AttributeValueDoubleQuotedState,
|
| AttributeValueSingleQuotedState,
|
| AttributeValueUnquotedState,
|
| - CharacterReferenceInAttributeValueState,
|
| AfterAttributeValueQuotedState,
|
| SelfClosingStartTagState,
|
| BogusCommentState,
|
| @@ -87,8 +88,6 @@ public:
|
| private:
|
| HTMLTokenizer();
|
|
|
| - inline bool processEntity(SegmentedString&);
|
| -
|
| inline void parseError();
|
|
|
| inline void bufferCharacter(UChar character)
|
| @@ -156,11 +155,11 @@ private:
|
| // this member might be pointing to unallocated memory.
|
| HTMLToken* m_token;
|
|
|
| - // http://www.whatwg.org/specs/web-apps/current-work/#additional-allowed-character
|
| - UChar m_additionalAllowedCharacter;
|
| + State m_returnState;
|
|
|
| // http://www.whatwg.org/specs/web-apps/current-work/#preprocessing-the-input-stream
|
| InputStreamPreprocessor<HTMLTokenizer> m_inputStreamPreprocessor;
|
| + HTMLEntityParser m_entityParser;
|
|
|
| Vector<UChar, 32> m_appropriateEndTagName;
|
|
|
|
|