<!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>[279505] 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/279505">279505</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-07-02 08:38:36 -0700 (Fri, 02 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/279494">r279494</a>.
https://bugs.webkit.org/show_bug.cgi?id=227628

Broke api test
TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList

Reverted changeset:

"loadSimulatedRequest: should do same delegate callbacks as
loadHTMLString and loadData"
https://bugs.webkit.org/show_bug.cgi?id=227599
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/279494">r279494</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewLoadAPIsmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (279504 => 279505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Source/WebKit/ChangeLog       2021-07-02 15:38:36 UTC (rev 279505)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-07-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r279494.
+        https://bugs.webkit.org/show_bug.cgi?id=227628
+
+        Broke api test
+        TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList
+
+        Reverted changeset:
+
+        "loadSimulatedRequest: should do same delegate callbacks as
+        loadHTMLString and loadData"
+        https://bugs.webkit.org/show_bug.cgi?id=227599
+        https://commits.webkit.org/r279494
+
</ins><span class="cx"> 2021-07-02  Antoine Quint  <graouts@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r279477): WebKit_iosmac failed to build in : ModelElementControllerCocoa.mm:58:24: member reference type 'WebKit::WebPageProxy' is not a pointer; did you mean to use '.'?
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (279504 => 279505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2021-07-02 15:38:36 UTC (rev 279505)
</span><span class="lines">@@ -1793,8 +1793,7 @@
</span><span class="cx">     m_pendingNavigationID = loadParameters.navigationID;
</span><span class="cx">     m_pendingWebsitePolicies = WTFMove(loadParameters.websitePolicies);
</span><span class="cx"> 
</span><del>-    auto unreachableURL = loadParameters.unreachableURLString.isEmpty() ? URL() : URL(URL(), loadParameters.unreachableURLString);
-    SubstituteData substituteData(WTFMove(sharedBuffer), unreachableURL, simulatedResponse, SubstituteData::SessionHistoryVisibility::Visible);
</del><ins>+    SubstituteData substituteData(WTFMove(sharedBuffer), loadParameters.request.url(), simulatedResponse, SubstituteData::SessionHistoryVisibility::Visible);
</ins><span class="cx"> 
</span><span class="cx">     // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx">     // to all the client to set up any needed state.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (279504 => 279505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Tools/ChangeLog       2021-07-02 15:38:36 UTC (rev 279505)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-07-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r279494.
+        https://bugs.webkit.org/show_bug.cgi?id=227628
+
+        Broke api test
+        TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList
+
+        Reverted changeset:
+
+        "loadSimulatedRequest: should do same delegate callbacks as
+        loadHTMLString and loadData"
+        https://bugs.webkit.org/show_bug.cgi?id=227599
+        https://commits.webkit.org/r279494
+
</ins><span class="cx"> 2021-07-02  Xabier Rodriguez Calvar  <calvaris@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] media/event-attributes.html fails if mixer is not at 100%
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewLoadAPIsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm (279504 => 279505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm 2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm    2021-07-02 15:38:36 UTC (rev 279505)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import <WebKit/WKFoundation.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><del>-#import <wtf/Vector.h>
</del><span class="cx"> #import <wtf/cocoa/NSURLExtras.h>
</span><span class="cx"> 
</span><span class="cx"> static NSString *exampleURLString = @"https://example.com/";
</span><span class="lines">@@ -83,61 +82,6 @@
</span><span class="cx">     [delegate waitForDidFinishNavigation];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TEST(WKWebView, LoadSimulatedRequestDelegateCallbacks)
-{
-    enum class Callback : uint8_t {
-        NavigationAction,
-        NavigationResponse,
-        StartProvisional,
-        Commit,
-        Finish
-    };
-
-    auto checkCallbacks = [] (const Vector<Callback> vector) {
-        ASSERT_EQ(vector.size(), 4u);
-        EXPECT_EQ(vector[0], Callback::NavigationAction);
-        EXPECT_EQ(vector[1], Callback::StartProvisional);
-        EXPECT_EQ(vector[2], Callback::Commit);
-        EXPECT_EQ(vector[3], Callback::Finish);
-    };
-
-    __block Vector<Callback> callbacks;
-    __block bool finished = false;
-    auto delegate = adoptNS([TestNavigationDelegate new]);
-    delegate.get().decidePolicyForNavigationAction = ^(WKNavigationAction *, void (^completionHandler)(WKNavigationActionPolicy)) {
-        callbacks.append(Callback::NavigationAction);
-        completionHandler(WKNavigationActionPolicyAllow);
-    };
-    delegate.get().decidePolicyForNavigationResponse = ^(WKNavigationResponse *, void (^completionHandler)(WKNavigationResponsePolicy)) {
-        callbacks.append(Callback::NavigationResponse);
-        completionHandler(WKNavigationResponsePolicyAllow);
-    };
-    delegate.get().didStartProvisionalNavigation = ^(WKWebView *, WKNavigation *) {
-        callbacks.append(Callback::StartProvisional);
-    };
-    delegate.get().didCommitNavigation = ^(WKWebView *, WKNavigation *) {
-        callbacks.append(Callback::Commit);
-    };
-    delegate.get().didFinishNavigation = ^(WKWebView *, WKNavigation *) {
-        callbacks.append(Callback::Finish);
-        finished = true;
-    };
-
-    auto webView = adoptNS([WKWebView new]);
-    webView.get().navigationDelegate = delegate.get();
-    NSURL *url = [NSURL URLWithString:@"https://webkit.org/"];
-    [webView loadHTMLString:@"hi!" baseURL:url];
-    TestWebKitAPI::Util::run(&finished);
-
-    checkCallbacks(callbacks);
-    callbacks = { };
-    finished = false;
-
-    [webView loadSimulatedRequest:[NSURLRequest requestWithURL:url] response:adoptNS([[NSURLResponse alloc] initWithURL:url MIMEType:@"text/html" expectedContentLength:3 textEncodingName:nil]).get() responseData:[NSData dataWithBytes:"hi!" length:3]];
-    TestWebKitAPI::Util::run(&finished);
-    checkCallbacks(callbacks);
-}
-
</del><span class="cx"> TEST(WKWebView, LoadFileRequest)
</span><span class="cx"> {
</span><span class="cx">     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span></span></pre>
</div>
</div>

</body>
</html>