Changeset 227743 in webkit
- Timestamp:
- Jan 29, 2018 11:27:06 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r227741 r227743 1 2018-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 1 14 2018-01-29 Youenn Fablet <youenn@apple.com> 2 15 -
trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash-expected.txt
r227731 r227743 1 1 This test passes if it does not crash. 2 3 -
trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash.html
r227731 r227743 24 24 <p>This test passes if it does not crash.</p> 25 25 <del id="del"> 26 <iframe id="iframe"></iframe> 27 </del> 26 <iframe id="iframe"></iframe> 28 27 </body> -
trunk/LayoutTests/platform/mac-wk1/TestExpectations
r227731 r227743 454 454 webkit.org/b/175886 svg/animations/smil-leak-element-instances.svg [ Pass Failure ] 455 455 456 webkit.org/b/177020 fast/events/beforeunload-dom-manipulation-crash.html [ Skip ] 457 456 458 # <rdar://problem/29201698> DumpRenderTree crashed in com.apple.CoreGraphics: CGDataProviderCopyData + 377 457 459 [ HighSierra+ ] fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html [ Crash ] -
trunk/Source/WebCore/ChangeLog
r227737 r227743 1 2018-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 1 14 2018-01-29 Brady Eidson <beidson@apple.com> 2 15 -
trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp
r227731 r227743 81 81 if (RefPtr<Frame> frame = contentFrame()) { 82 82 Ref<Frame> protect(*frame); 83 // FrameLoader::frameDetached() might dispatch an unload event.84 ASSERT(ScriptDisallowedScope::InMainThread::isScriptAllowed());85 83 frame->loader().frameDetached(); 86 84 frame->disconnectOwnerElement(); -
trunk/Source/WebCore/loader/FrameLoader.cpp
r227731 r227743 1255 1255 } 1256 1256 1257 bool FrameLoader::isStopLoadingAllowed() const1258 {1259 return m_pageDismissalEventBeingDispatched == PageDismissalType::None;1260 }1261 1262 1257 struct SharedBool : public RefCounted<SharedBool> { 1263 1258 bool value { false }; … … 1673 1668 { 1674 1669 ASSERT(!m_frame.document() || m_frame.document()->pageCacheState() != Document::InPageCache); 1675 if (!is StopLoadingAllowed())1670 if (!isNavigationAllowed()) 1676 1671 return; 1677 1672 -
trunk/Source/WebCore/loader/FrameLoader.h
r227731 r227743 390 390 391 391 bool isNavigationAllowed() const; 392 bool isStopLoadingAllowed() const;393 392 394 393 Frame& m_frame; -
trunk/Tools/ChangeLog
r227740 r227743 1 2018-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 1 14 2018-01-29 Youenn Fablet <youenn@apple.com> 2 15 -
trunk/Tools/DumpRenderTree/TestRunner.cpp
r227731 r227743 1984 1984 controller->simulateWebNotificationClick(arguments[0]); 1985 1985 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();1993 1986 return JSValueMakeUndefined(context); 1994 1987 } … … 2250 2243 { "setSpellCheckerLoggingEnabled", setSpellCheckerLoggingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 2251 2244 { "setOpenPanelFiles", setOpenPanelFilesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 2252 { "forceImmediateCompletion", forceImmediateCompletionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },2253 2245 { 0, 0, 0 } 2254 2246 };
Note: See TracChangeset
for help on using the changeset viewer.