Changeset 139799 in webkit


Ignore:
Timestamp:
Jan 15, 2013 3:40:29 PM (11 years ago)
Author:
leviw@chromium.org
Message:

Unreviewed, rolling out r139790.
​http://trac.webkit.org/changeset/139790
​https://bugs.webkit.org/show_bug.cgi?id=106948

The patch is failing its own test.

Source/JavaScriptCore:

  • bytecode/GlobalResolveInfo.h: Removed property svn:mergeinfo.

Source/WebCore:

  • dom/ContainerNode.cpp:

(WebCore::ContainerNode::parserInsertBefore):
(WebCore::ContainerNode::parserRemoveChild):
(WebCore::ContainerNode::parserAppendChild):

  • html/parser/HTMLScriptRunner.cpp:

(WebCore::HTMLScriptRunner::executeParsingBlockingScript):
(WebCore::HTMLScriptRunner::executePendingScriptAndDispatchEvent):
(WebCore::HTMLScriptRunner::execute):
(WebCore::HTMLScriptRunner::executeScriptsWaitingForLoad):
(WebCore::HTMLScriptRunner::executeScriptsWaitingForStylesheets):
(WebCore::HTMLScriptRunner::executeScriptsWaitingForParsing):
(WebCore::HTMLScriptRunner::runScript):

LayoutTests:

  • fast/dom/MutationObserver/parser-mutations-expected.txt: Removed.
  • fast/dom/MutationObserver/parser-mutations.html: Removed.
Location:
trunk
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r139798 r139799  
     12013-01-15  Levi Weintraub  <leviw@chromium.org>
     2
     3        Unreviewed, rolling out r139790.
     4        http://trac.webkit.org/changeset/139790
     5        https://bugs.webkit.org/show_bug.cgi?id=106948
     6
     7        The patch is failing its own test.
     8
     9        * fast/dom/MutationObserver/parser-mutations-expected.txt: Removed.
     10        * fast/dom/MutationObserver/parser-mutations.html: Removed.
     11
    1122013-01-15  Emil A Eklund  <eae@chromium.org>
    213

  • trunk/Source/JavaScriptCore/ChangeLog

    r139765 r139799  
     12013-01-15  Levi Weintraub  <leviw@chromium.org>
     2
     3        Unreviewed, rolling out r139790.
     4        http://trac.webkit.org/changeset/139790
     5        https://bugs.webkit.org/show_bug.cgi?id=106948
     6
     7        The patch is failing its own test.
     8
     9        * bytecode/GlobalResolveInfo.h: Removed property svn:mergeinfo.
     10
    1112013-01-15  Zan Dobersek  <zandobersek@gmail.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r139798 r139799  
     12013-01-15  Levi Weintraub  <leviw@chromium.org>
     2
     3        Unreviewed, rolling out r139790.
     4        http://trac.webkit.org/changeset/139790
     5        https://bugs.webkit.org/show_bug.cgi?id=106948
     6
     7        The patch is failing its own test.
     8
     9        * dom/ContainerNode.cpp:
     10        (WebCore::ContainerNode::parserInsertBefore):
     11        (WebCore::ContainerNode::parserRemoveChild):
     12        (WebCore::ContainerNode::parserAppendChild):
     13        * html/parser/HTMLScriptRunner.cpp:
     14        (WebCore::HTMLScriptRunner::executeParsingBlockingScript):
     15        (WebCore::HTMLScriptRunner::executePendingScriptAndDispatchEvent):
     16        (WebCore::HTMLScriptRunner::execute):
     17        (WebCore::HTMLScriptRunner::executeScriptsWaitingForLoad):
     18        (WebCore::HTMLScriptRunner::executeScriptsWaitingForStylesheets):
     19        (WebCore::HTMLScriptRunner::executeScriptsWaitingForParsing):
     20        (WebCore::HTMLScriptRunner::runScript):
     21
    1222013-01-15  Emil A Eklund  <eae@chromium.org>
    223

  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r139790 r139799  
    332332    insertBeforeCommon(nextChild, newChild.get());
    333333
    334 #if ENABLE(MUTATION_OBSERVERS)
    335     ChildListMutationScope(this).childAdded(newChild.get());
    336 #endif
    337 
    338334    childrenChanged(true, newChild->previousSibling(), nextChild, 1);
    339335    ChildNodeInsertionNotifier(this).notify(newChild.get());
    … …  
    556552    Node* prev = oldChild->previousSibling();
    557553    Node* next = oldChild->nextSibling();
    558 
    559 #if ENABLE(MUTATION_OBSERVERS)
    560     ChildListMutationScope(this).willRemoveChild(oldChild);
    561     oldChild->notifyMutationObserversNodeWillDetach();
    562 #endif
    563554
    564555    removeBetween(prev, next, oldChild);
    … …  
    706697        treeScope()->adoptIfNeeded(newChild.get());
    707698    }
    708 
    709 #if ENABLE(MUTATION_OBSERVERS)
    710     ChildListMutationScope(this).childAdded(newChild.get());
    711 #endif
    712699
    713700    childrenChanged(true, last, 0, 1);

  • trunk/Source/WebCore/html/parser/HTMLScriptRunner.cpp

    r139790 r139799  
    3737#include "HTMLScriptRunnerHost.h"
    3838#include "IgnoreDestructiveWriteCountIncrementer.h"
    39 #include "MutationObserver.h"
    4039#include "NestingLevelIncrementer.h"
    4140#include "NotImplemented.h"
    … …  
    112111{
    113112    ASSERT(m_document);
    114     ASSERT(!isExecutingScript());
     113    ASSERT(!m_scriptNestingLevel);
    115114    ASSERT(m_document->haveStylesheetsLoaded());
    116115    ASSERT(isPendingScriptReady(m_parserBlockingScript));
    … …  
    128127    if (pendingScript.cachedScript() && pendingScript.watchingForLoad())
    129128        stopWatchingForLoad(pendingScript);
    130 
    131 #if ENABLE(MUTATION_OBSERVERS)
    132     if (!isExecutingScript())
    133         MutationObserver::deliverAllMutations();
    134 #endif
    135129
    136130    // Clear the pending script before possible rentrancy from executeScript()
    … …  
    147141        }
    148142    }
    149     ASSERT(!isExecutingScript());
     143    ASSERT(!m_scriptNestingLevel);
    150144}
    151145
    … …  
    177171
    178172    if (hasParserBlockingScript()) {
    179         if (isExecutingScript())
     173        if (m_scriptNestingLevel)
    180174            return; // Unwind to the outermost HTMLScriptRunner::execute before continuing parsing.
    181175        // If preload scanner got created, it is missing the source after the current insertion point. Append it and scan.
    … …  
    199193void HTMLScriptRunner::executeScriptsWaitingForLoad(CachedResource* cachedScript)
    200194{
    201     ASSERT(!isExecutingScript());
     195    ASSERT(!m_scriptNestingLevel);
    202196    ASSERT(hasParserBlockingScript());
    203197    ASSERT_UNUSED(cachedScript, m_parserBlockingScript.cachedScript() == cachedScript);
    … …  
    212206    // to prevent parser or script re-entry during </style> parsing.
    213207    ASSERT(hasScriptsWaitingForStylesheets());
    214     ASSERT(!isExecutingScript());
     208    ASSERT(!m_scriptNestingLevel);
    215209    ASSERT(m_document->haveStylesheetsLoaded());
    216210    executeParsingBlockingScripts();
    … …  
    220214{
    221215    while (!m_scriptsToExecuteAfterParsing.isEmpty()) {
    222         ASSERT(!isExecutingScript());
     216        ASSERT(!m_scriptNestingLevel);
    223217        ASSERT(!hasParserBlockingScript());
    224218        ASSERT(m_scriptsToExecuteAfterParsing.first().cachedScript());
    … …  
    281275    ASSERT(!hasParserBlockingScript());
    282276    {
     277        InsertionPointRecord insertionPointRecord(m_host->inputStream());
     278        NestingLevelIncrementer nestingLevelIncrementer(m_scriptNestingLevel);
     279
    283280        ScriptElement* scriptElement = toScriptElement(script);
    284281
    … …  
    290287        if (!scriptElement)
    291288            return;
    292 
    293 #if ENABLE(MUTATION_OBSERVERS)
    294         // FIXME: This may be too agressive as we always deliver mutations at
    295         // every script element, even if it's not ready to execute yet. There's
    296         // unfortuantely no obvious way to tell if prepareScript is going to
    297         // execute the script from out here.
    298         if (!isExecutingScript())
    299             MutationObserver::deliverAllMutations();
    300 #endif
    301 
    302         InsertionPointRecord insertionPointRecord(m_host->inputStream());
    303         NestingLevelIncrementer nestingLevelIncrementer(m_scriptNestingLevel);
    304289
    305290        scriptElement->prepareScript(scriptStartPosition);
Note: See TracChangeset for help on using the changeset viewer.