Changeset 62045 in webkit


Ignore:
Timestamp:
Jun 28, 2010 3:56:39 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-06-28 Adam Barth <abarth@webkit.org>

Reviewed by Eric Seidel.

The new tree builder should actually finish building the tree
https://bugs.webkit.org/show_bug.cgi?id=41314

Again, this patch makes progress on runner.html, but I haven't removed
the ASSERT yet.

  • html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::HTMLTreeBuilder): (WebCore::HTMLTreeBuilder::finished):
  • html/HTMLTreeBuilder.h:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r62043 r62045  
     12010-06-28  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        The new tree builder should actually finish building the tree
     6        https://bugs.webkit.org/show_bug.cgi?id=41314
     7
     8        Again, this patch makes progress on runner.html, but I haven't removed
     9        the ASSERT yet.
     10
     11        * html/HTMLTreeBuilder.cpp:
     12        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
     13        (WebCore::HTMLTreeBuilder::finished):
     14        * html/HTMLTreeBuilder.h:
     15
    1162010-06-28  Dumitru Daniliuc  <dumi@chromium.org>
    217
  • trunk/WebCore/html/HTMLTreeBuilder.cpp

    r62042 r62045  
    7979    , m_scriptToProcessStartLine(uninitializedLineNumberValue)
    8080    , m_fragmentScriptingPermission(FragmentScriptingAllowed)
     81    , m_isParsingFragment(false)
    8182{
    8283}
     
    9697    , m_scriptToProcessStartLine(uninitializedLineNumberValue)
    9798    , m_fragmentScriptingPermission(scriptingPermission)
     99    , m_isParsingFragment(true)
    98100{
    99101}
     
    919921    // We should call m_document->finishedParsing() here, except
    920922    // m_legacyTreeBuilder->finished() does it for us.
    921     if (m_legacyTreeBuilder)
     923    if (m_legacyTreeBuilder) {
    922924        m_legacyTreeBuilder->finished();
     925        return;
     926    }
     927
     928    AtomicHTMLToken eofToken(HTMLToken::EndOfFile, nullAtom);
     929    processToken(eofToken);
     930
     931    // Warning, this may delete the parser, so don't try to do anything else after this.
     932    if (!m_isParsingFragment)
     933        m_document->finishedParsing();
    923934}
    924935
  • trunk/WebCore/html/HTMLTreeBuilder.h

    r62042 r62045  
    254254    // from <script> tags (so javascript doesn't show up in pastes).
    255255    FragmentScriptingPermission m_fragmentScriptingPermission;
     256    bool m_isParsingFragment;
    256257};
    257258
Note: See TracChangeset for help on using the changeset viewer.