Changeset 140402 in webkit


Ignore:
Timestamp:
Jan 22, 2013 2:24:30 AM (11 years ago)
Author:
eric@webkit.org
Message:

Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
https://bugs.webkit.org/show_bug.cgi?id=107519

Reviewed by Adam Barth.

Source/WebCore:

Add some ASSERTs to be double-dog-sure that we're never using
any of the threading code when threading is not enabled.

I also removed an if-branch in the !ENABLE_THREADED_HTML_PARSER case
as it's not needed.

  • html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::prepareToStopParsing):
(WebCore::HTMLDocumentParser::startBackgroundParser):
(WebCore::HTMLDocumentParser::stopBackgroundParser):

Source/WebKit/chromium:

This makes our development lives easier, and makes it possible for the bots
to run threaded-parser-only tests by toggling the runtime enable
via window.internals.settings.

  • features.gypi:
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r140401 r140402  
     12013-01-22  Eric Seidel  <eric@webkit.org>
     2
     3        Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
     4        https://bugs.webkit.org/show_bug.cgi?id=107519
     5
     6        Reviewed by Adam Barth.
     7
     8        Add some ASSERTs to be double-dog-sure that we're never using
     9        any of the threading code when threading is not enabled.
     10
     11        I also removed an if-branch in the !ENABLE_THREADED_HTML_PARSER case
     12        as it's not needed.
     13
     14        * html/parser/HTMLDocumentParser.cpp:
     15        (WebCore::HTMLDocumentParser::prepareToStopParsing):
     16        (WebCore::HTMLDocumentParser::startBackgroundParser):
     17        (WebCore::HTMLDocumentParser::stopBackgroundParser):
     18
    1192013-01-22  Kentaro Hara  <haraken@chromium.org>
    220
  • trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

    r140209 r140402  
    147147    RefPtr<HTMLDocumentParser> protect(this);
    148148
     149#if ENABLE(THREADED_HTML_PARSER)
    149150    // NOTE: This pump should only ever emit buffered character tokens,
    150151    // so ForceSynchronous vs. AllowYield should be meaningless.
    151152    if (!shouldUseThreading())
     153#endif
    152154        pumpTokenizerIfPossible(ForceSynchronous);
    153    
     155
    154156    if (isStopped())
    155157        return;
     
    455457void HTMLDocumentParser::startBackgroundParser()
    456458{
     459    ASSERT(shouldUseThreading());
    457460    ASSERT(!m_haveBackgroundParser);
    458461    m_haveBackgroundParser = true;
     
    466469void HTMLDocumentParser::stopBackgroundParser()
    467470{
     471    ASSERT(shouldUseThreading());
    468472    ASSERT(m_haveBackgroundParser);
    469473    m_haveBackgroundParser = false;
  • trunk/Source/WebKit/chromium/ChangeLog

    r140401 r140402  
     12013-01-22  Eric Seidel  <eric@webkit.org>
     2
     3        Turn on ENABLE_THREADED_HTML_PARSER for Chromium (it's still disabled at runtime)
     4        https://bugs.webkit.org/show_bug.cgi?id=107519
     5
     6        Reviewed by Adam Barth.
     7
     8        This makes our development lives easier, and makes it possible for the bots
     9        to run threaded-parser-only tests by toggling the runtime enable
     10        via window.internals.settings.
     11
     12        * features.gypi:
     13
    1142013-01-22  Kentaro Hara  <haraken@chromium.org>
    215
  • trunk/Source/WebKit/chromium/features.gypi

    r140377 r140402  
    118118      'ENABLE_TEMPLATE_ELEMENT=1',
    119119      'ENABLE_TEXT_AUTOSIZING=1',
    120       'ENABLE_THREADED_HTML_PARSER=0',
     120      'ENABLE_THREADED_HTML_PARSER=1',
    121121      'ENABLE_TOUCH_ADJUSTMENT=1',
    122122      'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
Note: See TracChangeset for help on using the changeset viewer.