<!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>[277839] 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/277839">277839</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-05-20 17:15:13 -0700 (Thu, 20 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/277606">r277606</a>.
rdar://78283324

Source/WebKit:

Need to wait for more projects to migrate to new API.

Reverted changeset:

"[Cocoa] Remove prototype loadSimulatedRequest methods"
https://bugs.webkit.org/show_bug.cgi?id=223658
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/277606">r277606</a>

Tools:

Need to wait for more projects to migrate

Reverted changeset:

"[Cocoa] Remove prototype loadSimulatedRequest methods"
https://bugs.webkit.org/show_bug.cgi?id=223658
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/277606">r277606</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</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 (277838 => 277839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Source/WebKit/ChangeLog       2021-05-21 00:15:13 UTC (rev 277839)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-05-20  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, reverting r277606.
+        rdar://78283324
+
+        Need to wait for more projects to migrate to new API.
+
+        Reverted changeset:
+
+        "[Cocoa] Remove prototype loadSimulatedRequest methods"
+        https://bugs.webkit.org/show_bug.cgi?id=223658
+        https://commits.webkit.org/r277606
+
</ins><span class="cx"> 2021-05-20  Kate Cheney  <katherine_cheney@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Mark ServiceWorkerThreadProxy with a default app-bound value
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (277838 => 277839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h      2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-05-21 00:15:13 UTC (rev 277839)
</span><span class="lines">@@ -545,6 +545,7 @@
</span><span class="cx">  @result A new navigation.
</span><span class="cx"> */
</span><span class="cx"> - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request response:(NSURLResponse *)response responseData:(NSData *)data WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><ins>+- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponse:(NSURLResponse *)response responseData:(NSData *)data WK_API_DEPRECATED_WITH_REPLACEMENT("loadSimulatedRequest:response:responseData:", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
</ins><span class="cx"> 
</span><span class="cx"> /*! @abstract Navigates to the requested file URL on the filesystem.
</span><span class="cx">  @param request The request specifying the file URL to which to navigate.
</span><span class="lines">@@ -566,6 +567,7 @@
</span><span class="cx">  @result A new navigation.
</span><span class="cx"> */
</span><span class="cx"> - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request responseHTMLString:(NSString *)string NS_SWIFT_NAME(loadSimulatedRequest(_:responseHTML:)) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><ins>+- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponseHTMLString:(NSString *)string NS_SWIFT_NAME(loadSimulatedRequest(_:withResponseHTML:)) WK_API_DEPRECATED_WITH_REPLACEMENT("loadSimulatedRequest:responseHTMLString:", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
</ins><span class="cx"> 
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> /* @abstract Returns an NSPrintOperation object configured to print the contents of this WKWebView
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (277838 => 277839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2021-05-21 00:15:13 UTC (rev 277839)
</span><span class="lines">@@ -1700,6 +1700,13 @@
</span><span class="cx">     return wrapper(_page->loadSimulatedRequest(request, response, { static_cast<const uint8_t*>(data.bytes), data.length }));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME(223658): Remove this once adopters have moved to the final API.
+- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponse:(NSURLResponse *)response responseData:(NSData *)data
+{
+    THROW_IF_SUSPENDED;
+    return [self loadSimulatedRequest:request response:response responseData:data];
+}
+
</ins><span class="cx"> - (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request responseHTMLString:(NSString *)string
</span><span class="cx"> {
</span><span class="cx">     THROW_IF_SUSPENDED;
</span><span class="lines">@@ -1709,6 +1716,13 @@
</span><span class="cx">     return [self loadSimulatedRequest:request response:response.get() responseData:data];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME(223658): Remove this once adopters have moved to the final API.
+- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponseHTMLString:(NSString *)string
+{
+    THROW_IF_SUSPENDED;
+    return [self loadSimulatedRequest:request responseHTMLString:string];
+}
+
</ins><span class="cx"> - (WKNavigation *)loadFileRequest:(NSURLRequest *)request allowingReadAccessToURL:(NSURL *)readAccessURL
</span><span class="cx"> {
</span><span class="cx">     THROW_IF_SUSPENDED;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277838 => 277839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Tools/ChangeLog       2021-05-21 00:15:13 UTC (rev 277839)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-05-20  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, reverting r277606.
+        rdar://78283324
+
+        Need to wait for more projects to migrate
+
+        Reverted changeset:
+
+        "[Cocoa] Remove prototype loadSimulatedRequest methods"
+        https://bugs.webkit.org/show_bug.cgi?id=223658
+        https://commits.webkit.org/r277606
+
</ins><span class="cx"> 2021-05-20  Kate Cheney  <katherine_cheney@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Mark ServiceWorkerThreadProxy with a default app-bound value
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKWebViewLoadAPIsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm (277838 => 277839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm 2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm    2021-05-21 00:15:13 UTC (rev 277839)
</span><span class="lines">@@ -52,6 +52,12 @@
</span><span class="cx"> 
</span><span class="cx">     [webView loadSimulatedRequest:loadRequest responseHTMLString:htmlString];
</span><span class="cx">     [delegate waitForDidFinishNavigation];
</span><ins>+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    // FIXME(223658): Remove this once adopters have moved to the final API.
+    [webView loadSimulatedRequest:loadRequest withResponseHTMLString:htmlString];
+ALLOW_DEPRECATED_DECLARATIONS_END
+    [delegate waitForDidFinishNavigation];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WKWebView, LoadSimulatedRequestUsingResponseData)
</span><span class="lines">@@ -68,6 +74,12 @@
</span><span class="cx"> 
</span><span class="cx">     [webView loadSimulatedRequest:loadRequest response:response.get() responseData:data];
</span><span class="cx">     [delegate waitForDidFinishNavigation];
</span><ins>+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    // FIXME(223658): Remove this once adopters have moved to the final API.
+    [webView loadSimulatedRequest:loadRequest withResponse:response.get() responseData:data];
+ALLOW_DEPRECATED_DECLARATIONS_END
+    [delegate waitForDidFinishNavigation];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WKWebView, LoadFileRequest)
</span></span></pre>
</div>
</div>

</body>
</html>