Diff
Modified: trunk/LayoutTests/ChangeLog (227742 => 227743)
--- trunk/LayoutTests/ChangeLog 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/LayoutTests/ChangeLog 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1,3 +1,16 @@
+2018-01-29 Matt Lewis <jlew...@apple.com>
+
+ 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
+
2018-01-29 Youenn Fablet <you...@apple.com>
Move http/wpt/service-workers/clone-opaque-being-loaded-response.https.html to use HTTP
Modified: trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash-expected.txt (227742 => 227743)
--- trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash-expected.txt 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash-expected.txt 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1,3 +1 @@
This test passes if it does not crash.
-
-
Modified: trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash.html (227742 => 227743)
--- trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash.html 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/LayoutTests/fast/events/beforeunload-dom-manipulation-crash.html 2018-01-29 19:27:06 UTC (rev 227743)
@@ -23,6 +23,5 @@
<body _onload_="runTest()">
<p>This test passes if it does not crash.</p>
<del id="del">
- <iframe id="iframe"></iframe>
- </del>
+ <iframe id="iframe"></iframe>
</body>
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (227742 => 227743)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2018-01-29 19:27:06 UTC (rev 227743)
@@ -453,6 +453,8 @@
webkit.org/b/175886 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
+webkit.org/b/177020 fast/events/beforeunload-dom-manipulation-crash.html [ Skip ]
+
# <rdar://problem/29201698> DumpRenderTree crashed in com.apple.CoreGraphics: CGDataProviderCopyData + 377
[ HighSierra+ ] fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html [ Crash ]
Modified: trunk/Source/WebCore/ChangeLog (227742 => 227743)
--- trunk/Source/WebCore/ChangeLog 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Source/WebCore/ChangeLog 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1,3 +1,16 @@
+2018-01-29 Matt Lewis <jlew...@apple.com>
+
+ 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
+
2018-01-29 Brady Eidson <beid...@apple.com>
Make it possible for apps that use both WK1 and WK2 to use MessagePorts.
Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp (227742 => 227743)
--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2018-01-29 19:27:06 UTC (rev 227743)
@@ -80,8 +80,6 @@
// see if this behavior is really needed as Gecko does not allow this.
if (RefPtr<Frame> frame = contentFrame()) {
Ref<Frame> protect(*frame);
- // FrameLoader::frameDetached() might dispatch an unload event.
- ASSERT(ScriptDisallowedScope::InMainThread::isScriptAllowed());
frame->loader().frameDetached();
frame->disconnectOwnerElement();
}
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (227742 => 227743)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1254,11 +1254,6 @@
return m_pageDismissalEventBeingDispatched == PageDismissalType::None && NavigationDisabler::isNavigationAllowed(m_frame);
}
-bool FrameLoader::isStopLoadingAllowed() const
-{
- return m_pageDismissalEventBeingDispatched == PageDismissalType::None;
-}
-
struct SharedBool : public RefCounted<SharedBool> {
bool value { false };
};
@@ -1672,7 +1667,7 @@
void FrameLoader::stopAllLoaders(ClearProvisionalItemPolicy clearProvisionalItemPolicy)
{
ASSERT(!m_frame.document() || m_frame.document()->pageCacheState() != Document::InPageCache);
- if (!isStopLoadingAllowed())
+ if (!isNavigationAllowed())
return;
// If this method is called from within this method, infinite recursion can occur (3442218). Avoid this.
Modified: trunk/Source/WebCore/loader/FrameLoader.h (227742 => 227743)
--- trunk/Source/WebCore/loader/FrameLoader.h 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2018-01-29 19:27:06 UTC (rev 227743)
@@ -389,7 +389,6 @@
void dispatchGlobalObjectAvailableInAllWorlds();
bool isNavigationAllowed() const;
- bool isStopLoadingAllowed() const;
Frame& m_frame;
FrameLoaderClient& m_client;
Modified: trunk/Tools/ChangeLog (227742 => 227743)
--- trunk/Tools/ChangeLog 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Tools/ChangeLog 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1,3 +1,16 @@
+2018-01-29 Matt Lewis <jlew...@apple.com>
+
+ 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
+
2018-01-29 Youenn Fablet <you...@apple.com>
WPT test exporter should add WebKit export in its PR description
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (227742 => 227743)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2018-01-29 19:13:45 UTC (rev 227742)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2018-01-29 19:27:06 UTC (rev 227743)
@@ -1986,13 +1986,6 @@
return JSValueMakeUndefined(context);
}
-static JSValueRef forceImmediateCompletionCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- controller->forceImmediateCompletion();
- return JSValueMakeUndefined(context);
-}
-
static JSValueRef failNextNewCodeBlock(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
if (argumentCount < 1)
@@ -2249,7 +2242,6 @@
{ "imageCountInGeneralPasteboard", imageCountInGeneralPasteboardCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setSpellCheckerLoggingEnabled", setSpellCheckerLoggingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setOpenPanelFiles", setOpenPanelFilesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "forceImmediateCompletion", forceImmediateCompletionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0 }
};
