Diff
Modified: trunk/LayoutTests/ChangeLog (204917 => 204918)
--- trunk/LayoutTests/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/ChangeLog 2016-08-24 19:27:24 UTC (rev 204918)
@@ -1,3 +1,18 @@
+2016-08-24 Jonathan Bedard <[email protected]>
+
+ WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
+ https://bugs.webkit.org/show_bug.cgi?id=42777
+
+ Reviewed by Darin Adler.
+
+ The setDeferMainResourceDataLoad method was not correctly tested in DumpRenderTree and would pass even when setDeterMainResourceDataLoad was not called. Removed function and test.
+
+ * fast/loader/non-deferred-substitute-load-expected.txt: Removed fast/loader/non-deferred-substitute-load.html.
+ * fast/loader/non-deferred-substitute-load.html: Ditto.
+ * platform/ios-simulator-wk2/TestExpectations: Ditto.
+ * platform/win/TestExpectations: Ditto.
+ * platform/wk2/TestExpectations: Ditto.
+
2016-08-24 Chris Dumez <[email protected]>
Unreviewed, temporarily skipping W3C tests trying to load www1.localhost.
Deleted: trunk/LayoutTests/fast/loader/non-deferred-substitute-load-expected.txt (204917 => 204918)
--- trunk/LayoutTests/fast/loader/non-deferred-substitute-load-expected.txt 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/fast/loader/non-deferred-substitute-load-expected.txt 2016-08-24 19:27:24 UTC (rev 204918)
@@ -1,2 +0,0 @@
-ALERT: Triggering bug through JS-alert
-PASS
Deleted: trunk/LayoutTests/fast/loader/non-deferred-substitute-load.html (204917 => 204918)
--- trunk/LayoutTests/fast/loader/non-deferred-substitute-load.html 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/fast/loader/non-deferred-substitute-load.html 2016-08-24 19:27:24 UTC (rev 204918)
@@ -1,15 +0,0 @@
-<p>This tests that using substitute load in combination with non-deferred main resource loading will not cause
-assertions or duplicate loads, which can happen if the substitute document contains _javascript_-alerts.</p>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setDeferMainResourceDataLoad(false);
- testRunner.queueLoadHTMLString("<script>if (typeof(hasBeenLoaded) != 'undefined') {" +
- "document.getElementById('result').innerHTML = 'FAILURE';" +
- "} else { " +
- "hasBeenLoaded = true; document.write('<div id=result>PASS</div>'); alert('Triggering bug through JS-alert'); }" +
- "<\/script>");
-} else
- document.write('This test must be run by DumpRenderTree!')
-</script>
-
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (204917 => 204918)
--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-24 19:27:24 UTC (rev 204918)
@@ -522,7 +522,6 @@
fast/images/image-map-zoom.html [ Failure ]
fast/images/imagemap-dynamic-area-updates.html [ Failure ]
fast/inline/relative-positioned-overflow.html [ Failure ]
-fast/loader/non-deferred-substitute-load.html [ Failure ]
fast/loader/policy-delegate-action-hit-test-zoomed.html [ Failure ]
fast/loader/repeat-same-document-navigation.html [ Failure ]
fast/regions/assert-hit-test-image.html [ Failure ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (204917 => 204918)
--- trunk/LayoutTests/platform/win/TestExpectations 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-08-24 19:27:24 UTC (rev 204918)
@@ -2531,9 +2531,6 @@
webkit.org/b/140866 fast/repaint/obscured-background-no-repaint.html [ Failure ]
[ Debug ] fast/repaint/animation-after-layer-scroll.html [ Failure ]
-# Main frame document does not match cached page document:
-webkit.org/b/140871 [ Debug ] fast/loader/non-deferred-substitute-load.html [ Skip ]
-
[ Release ] platform/win/fast/text/uniscribe-missing-glyph.html [ Failure ]
[ Debug ] platform/win/fast/text/uniscribe-missing-glyph.html [ Skip ] # Debug assertion
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (204917 => 204918)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2016-08-24 19:27:24 UTC (rev 204918)
@@ -150,10 +150,6 @@
# <https://bugs.webkit.org/show_bug.cgi?id=42700>
http/tests/security/setDomainRelaxationForbiddenForURLScheme.html
-# WebKit2 needs testRunner.setDeferMainResourceDataLoad
-# <https://bugs.webkit.org/show_bug.cgi?id=42777>
-fast/loader/non-deferred-substitute-load.html
-
# WebKitTestRunner needs testRunner.removeAllVisitedLinks
http/tests/globalhistory/history-delegate-basic-visited-links.html
Modified: trunk/Tools/ChangeLog (204917 => 204918)
--- trunk/Tools/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/Tools/ChangeLog 2016-08-24 19:27:24 UTC (rev 204918)
@@ -1,3 +1,19 @@
+2016-08-24 Jonathan Bedard <[email protected]>
+
+ WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
+ https://bugs.webkit.org/show_bug.cgi?id=42777
+
+ Reviewed by Darin Adler.
+
+ The setDeferMainResourceDataLoad method was not correctly tested in DumpRenderTree and would pass even when setDeterMainResourceDataLoad was not called. Removed function and test.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (setDeferMainResourceDataLoadCallback): Removed setDeferMainResourceDataLoad.
+ * DumpRenderTree/TestRunner.h:
+ (TestRunner::deferMainResourceDataLoad): Ditto.
+ (TestRunner::setDeferMainResourceDataLoad): Ditto.
+ * DumpRenderTree/mac/ResourceLoadDelegate.mm: Ditto.
+
2016-08-23 Anders Carlsson <[email protected]>
Add enum traits and use them in the IPC::Decoder
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (204917 => 204918)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-08-24 19:27:24 UTC (rev 204918)
@@ -107,7 +107,6 @@
, m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges(false)
, m_handlesAuthenticationChallenges(false)
, m_isPrinting(false)
- , m_deferMainResourceDataLoad(true)
, m_useDeferredFrameLoading(false)
, m_shouldPaintBrokenImage(true)
, m_shouldStayOnPageAfterHandlingBeforeUnload(false)
@@ -914,18 +913,6 @@
return JSValueMakeUndefined(context);
}
-static JSValueRef setDeferMainResourceDataLoadCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- // Has Mac and Windows implementation
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- controller->setDeferMainResourceDataLoad(JSValueToBoolean(context, arguments[0]));
-
- return JSValueMakeUndefined(context);
-}
-
static JSValueRef setDefersLoadingCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
if (argumentCount < 1)
@@ -2150,7 +2137,6 @@
{ "setCloseRemainingWindowsWhenComplete", setCloseRemainingWindowsWhenCompleteCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setCustomPolicyDelegate", setCustomPolicyDelegateCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setDatabaseQuota", setDatabaseQuotaCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "setDeferMainResourceDataLoad", setDeferMainResourceDataLoadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setDefersLoading", setDefersLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setUseDeferredFrameLoading", setUseDeferredFrameLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "setDomainRelaxationForbiddenForURLScheme", setDomainRelaxationForbiddenForURLSchemeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (204917 => 204918)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2016-08-24 19:27:24 UTC (rev 204918)
@@ -295,9 +295,6 @@
double databaseMaxQuota() const { return m_databaseMaxQuota; }
void setDatabaseMaxQuota(double quota) { m_databaseMaxQuota = quota; }
- bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
- void setDeferMainResourceDataLoad(bool flag) { m_deferMainResourceDataLoad = flag; }
-
bool useDeferredFrameLoading() const { return m_useDeferredFrameLoading; }
void setUseDeferredFrameLoading(bool flag) { m_useDeferredFrameLoading = flag; }
@@ -431,7 +428,6 @@
bool m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges;
bool m_handlesAuthenticationChallenges;
bool m_isPrinting;
- bool m_deferMainResourceDataLoad;
bool m_useDeferredFrameLoading;
bool m_shouldPaintBrokenImage;
bool m_shouldStayOnPageAfterHandlingBeforeUnload;
Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm (204917 => 204918)
--- trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2016-08-24 19:27:24 UTC (rev 204918)
@@ -150,10 +150,6 @@
printf("%s\n", [string UTF8String]);
}
- if (!done && !gTestRunner->deferMainResourceDataLoad()) {
- [dataSource _setDeferMainResourceDataLoad:false];
- }
-
if (!done && gTestRunner->willSendRequestReturnsNull())
return nil;
