Changeset 227743 in webkit


Ignore:
Timestamp:
Jan 29, 2018 11:27:06 AM (6 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r227731.

This caused and assertion failure in API tests.

Reverted changeset:

"Layout Test fast/events/beforeunload-dom-manipulation-
crash.html is crashing"
https://bugs.webkit.org/show_bug.cgi?id=181204
https://trac.webkit.org/changeset/227731

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r227741 r227743  
     12018-01-29  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r227731.
     4
     5        This caused and assertion failure in API tests.
     6
     7        Reverted changeset:
     8
     9        "Layout Test fast/events/beforeunload-dom-manipulation-
     10        crash.html is crashing"
     11        https://bugs.webkit.org/show_bug.cgi?id=181204
     12        https://trac.webkit.org/changeset/227731
     13
    1142018-01-29  Youenn Fablet  <youenn@apple.com>
    215
  • trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash-expected.txt

    r227731 r227743  
    11This test passes if it does not crash.
    2 
    3 
  • trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash.html

    r227731 r227743  
    2424    <p>This test passes if it does not crash.</p>
    2525    <del id="del">
    26         <iframe id="iframe"></iframe>
    27     </del>
     26    <iframe id="iframe"></iframe>
    2827</body>
  • trunk/LayoutTests/platform/mac-wk1/TestExpectations

    r227731 r227743  
    454454webkit.org/b/175886 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
    455455
     456webkit.org/b/177020 fast/events/beforeunload-dom-manipulation-crash.html [ Skip ]
     457
    456458# <rdar://problem/29201698> DumpRenderTree crashed in com.apple.CoreGraphics: CGDataProviderCopyData + 377
    457459[ HighSierra+ ] fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html [ Crash ]
  • trunk/Source/WebCore/ChangeLog

    r227737 r227743  
     12018-01-29  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r227731.
     4
     5        This caused and assertion failure in API tests.
     6
     7        Reverted changeset:
     8
     9        "Layout Test fast/events/beforeunload-dom-manipulation-
     10        crash.html is crashing"
     11        https://bugs.webkit.org/show_bug.cgi?id=181204
     12        https://trac.webkit.org/changeset/227731
     13
    1142018-01-29  Brady Eidson  <beidson@apple.com>
    215
  • trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp

    r227731 r227743  
    8181    if (RefPtr<Frame> frame = contentFrame()) {
    8282        Ref<Frame> protect(*frame);
    83         // FrameLoader::frameDetached() might dispatch an unload event.
    84         ASSERT(ScriptDisallowedScope::InMainThread::isScriptAllowed());
    8583        frame->loader().frameDetached();
    8684        frame->disconnectOwnerElement();
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r227731 r227743  
    12551255}
    12561256
    1257 bool FrameLoader::isStopLoadingAllowed() const
    1258 {
    1259     return m_pageDismissalEventBeingDispatched == PageDismissalType::None;
    1260 }
    1261 
    12621257struct SharedBool : public RefCounted<SharedBool> {
    12631258    bool value { false };
     
    16731668{
    16741669    ASSERT(!m_frame.document() || m_frame.document()->pageCacheState() != Document::InPageCache);
    1675     if (!isStopLoadingAllowed())
     1670    if (!isNavigationAllowed())
    16761671        return;
    16771672
  • trunk/Source/WebCore/loader/FrameLoader.h

    r227731 r227743  
    390390
    391391    bool isNavigationAllowed() const;
    392     bool isStopLoadingAllowed() const;
    393392
    394393    Frame& m_frame;
  • trunk/Tools/ChangeLog

    r227740 r227743  
     12018-01-29  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r227731.
     4
     5        This caused and assertion failure in API tests.
     6
     7        Reverted changeset:
     8
     9        "Layout Test fast/events/beforeunload-dom-manipulation-
     10        crash.html is crashing"
     11        https://bugs.webkit.org/show_bug.cgi?id=181204
     12        https://trac.webkit.org/changeset/227731
     13
    1142018-01-29  Youenn Fablet  <youenn@apple.com>
    215
  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r227731 r227743  
    19841984    controller->simulateWebNotificationClick(arguments[0]);
    19851985
    1986     return JSValueMakeUndefined(context);
    1987 }
    1988 
    1989 static JSValueRef forceImmediateCompletionCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1990 {
    1991     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    1992     controller->forceImmediateCompletion();
    19931986    return JSValueMakeUndefined(context);
    19941987}
     
    22502243        { "setSpellCheckerLoggingEnabled", setSpellCheckerLoggingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22512244        { "setOpenPanelFiles", setOpenPanelFilesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2252         { "forceImmediateCompletion", forceImmediateCompletionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22532245        { 0, 0, 0 }
    22542246    };
Note: See TracChangeset for help on using the changeset viewer.