<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204918] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204918">204918</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-24 12:27:24 -0700 (Wed, 24 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
https://bugs.webkit.org/show_bug.cgi?id=42777
Patch by Jonathan Bedard <jbedard@apple.com> on 2016-08-24
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.
Tools:
* DumpRenderTree/TestRunner.cpp:
(setDeferMainResourceDataLoadCallback): Removed setDeferMainResourceDataLoad.
* DumpRenderTree/TestRunner.h:
(TestRunner::deferMainResourceDataLoad): Ditto.
(TestRunner::setDeferMainResourceDataLoad): Ditto.
* DumpRenderTree/mac/ResourceLoadDelegate.mm: Ditto.
LayoutTests:
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacResourceLoadDelegatemm">trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastloadernondeferredsubstituteloadexpectedtxt">trunk/LayoutTests/fast/loader/non-deferred-substitute-load-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloadernondeferredsubstituteloadhtml">trunk/LayoutTests/fast/loader/non-deferred-substitute-load.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/LayoutTests/ChangeLog 2016-08-24 19:27:24 UTC (rev 204918)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-24 Jonathan Bedard <jbedard@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-08-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, temporarily skipping W3C tests trying to load www1.localhost.
</span></span></pre></div>
<a id="trunkLayoutTestsfastloadernondeferredsubstituteloadexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/non-deferred-substitute-load-expected.txt (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-ALERT: Triggering bug through JS-alert
-PASS
</del></span></pre></div>
<a id="trunkLayoutTestsfastloadernondeferredsubstituteloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/loader/non-deferred-substitute-load.html (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-<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>
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -522,7 +522,6 @@
</span><span class="cx"> fast/images/image-map-zoom.html [ Failure ]
</span><span class="cx"> fast/images/imagemap-dynamic-area-updates.html [ Failure ]
</span><span class="cx"> fast/inline/relative-positioned-overflow.html [ Failure ]
</span><del>-fast/loader/non-deferred-substitute-load.html [ Failure ]
</del><span class="cx"> fast/loader/policy-delegate-action-hit-test-zoomed.html [ Failure ]
</span><span class="cx"> fast/loader/repeat-same-document-navigation.html [ Failure ]
</span><span class="cx"> fast/regions/assert-hit-test-image.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2531,9 +2531,6 @@
</span><span class="cx"> webkit.org/b/140866 fast/repaint/obscured-background-no-repaint.html [ Failure ]
</span><span class="cx"> [ Debug ] fast/repaint/animation-after-layer-scroll.html [ Failure ]
</span><span class="cx">
</span><del>-# Main frame document does not match cached page document:
-webkit.org/b/140871 [ Debug ] fast/loader/non-deferred-substitute-load.html [ Skip ]
-
</del><span class="cx"> [ Release ] platform/win/fast/text/uniscribe-missing-glyph.html [ Failure ]
</span><span class="cx"> [ Debug ] platform/win/fast/text/uniscribe-missing-glyph.html [ Skip ] # Debug assertion
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/TestExpectations (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -150,10 +150,6 @@
</span><span class="cx"> # <https://bugs.webkit.org/show_bug.cgi?id=42700>
</span><span class="cx"> http/tests/security/setDomainRelaxationForbiddenForURLScheme.html
</span><span class="cx">
</span><del>-# WebKit2 needs testRunner.setDeferMainResourceDataLoad
-# <https://bugs.webkit.org/show_bug.cgi?id=42777>
-fast/loader/non-deferred-substitute-load.html
-
</del><span class="cx"> # WebKitTestRunner needs testRunner.removeAllVisitedLinks
</span><span class="cx"> http/tests/globalhistory/history-delegate-basic-visited-links.html
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
+++ trunk/Tools/ChangeLog 2016-08-24 19:27:24 UTC (rev 204918)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-24 Jonathan Bedard <jbedard@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-08-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add enum traits and use them in the IPC::Decoder
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> , m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges(false)
</span><span class="cx"> , m_handlesAuthenticationChallenges(false)
</span><span class="cx"> , m_isPrinting(false)
</span><del>- , m_deferMainResourceDataLoad(true)
</del><span class="cx"> , m_useDeferredFrameLoading(false)
</span><span class="cx"> , m_shouldPaintBrokenImage(true)
</span><span class="cx"> , m_shouldStayOnPageAfterHandlingBeforeUnload(false)
</span><span class="lines">@@ -914,18 +913,6 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> static JSValueRef setDefersLoadingCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> if (argumentCount < 1)
</span><span class="lines">@@ -2150,7 +2137,6 @@
</span><span class="cx"> { "setCloseRemainingWindowsWhenComplete", setCloseRemainingWindowsWhenCompleteCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setCustomPolicyDelegate", setCustomPolicyDelegateCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setDatabaseQuota", setDatabaseQuotaCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><del>- { "setDeferMainResourceDataLoad", setDeferMainResourceDataLoadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</del><span class="cx"> { "setDefersLoading", setDefersLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setUseDeferredFrameLoading", setUseDeferredFrameLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setDomainRelaxationForbiddenForURLScheme", setDomainRelaxationForbiddenForURLSchemeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -295,9 +295,6 @@
</span><span class="cx"> double databaseMaxQuota() const { return m_databaseMaxQuota; }
</span><span class="cx"> void setDatabaseMaxQuota(double quota) { m_databaseMaxQuota = quota; }
</span><span class="cx">
</span><del>- bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
- void setDeferMainResourceDataLoad(bool flag) { m_deferMainResourceDataLoad = flag; }
-
</del><span class="cx"> bool useDeferredFrameLoading() const { return m_useDeferredFrameLoading; }
</span><span class="cx"> void setUseDeferredFrameLoading(bool flag) { m_useDeferredFrameLoading = flag; }
</span><span class="cx">
</span><span class="lines">@@ -431,7 +428,6 @@
</span><span class="cx"> bool m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges;
</span><span class="cx"> bool m_handlesAuthenticationChallenges;
</span><span class="cx"> bool m_isPrinting;
</span><del>- bool m_deferMainResourceDataLoad;
</del><span class="cx"> bool m_useDeferredFrameLoading;
</span><span class="cx"> bool m_shouldPaintBrokenImage;
</span><span class="cx"> bool m_shouldStayOnPageAfterHandlingBeforeUnload;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacResourceLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm (204917 => 204918)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -150,10 +150,6 @@
</span><span class="cx"> printf("%s\n", [string UTF8String]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!done && !gTestRunner->deferMainResourceDataLoad()) {
- [dataSource _setDeferMainResourceDataLoad:false];
- }
-
</del><span class="cx"> if (!done && gTestRunner->willSendRequestReturnsNull())
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>