diff options
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLDocumentParser.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp index a271603..0a1208d 100644 --- a/WebCore/html/HTMLDocumentParser.cpp +++ b/WebCore/html/HTMLDocumentParser.cpp @@ -282,15 +282,13 @@ void HTMLDocumentParser::insert(const SegmentedString& source) if (m_parserStopped) return; -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter); #endif -======= + // pumpTokenizer can cause this parser to be detached from the Document, // but we need to ensure it isn't deleted yet. RefPtr<HTMLDocumentParser> protect(this); ->>>>>>> webkit.org at r66079 { NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); |