Title: [277839] trunk
- Revision
- 277839
- Author
- [email protected]
- Date
- 2021-05-20 17:15:13 -0700 (Thu, 20 May 2021)
Log Message
Unreviewed, reverting r277606.
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/r277606
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/r277606
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (277838 => 277839)
--- 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)
@@ -1,3 +1,16 @@
+2021-05-20 Alex Christensen <[email protected]>
+
+ 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
+
2021-05-20 Kate Cheney <[email protected]>
Mark ServiceWorkerThreadProxy with a default app-bound value
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (277838 => 277839)
--- 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)
@@ -545,6 +545,7 @@
@result A new navigation.
*/
- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request response:(NSURLResponse *)response responseData:(NSData *)data WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (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));
/*! @abstract Navigates to the requested file URL on the filesystem.
@param request The request specifying the file URL to which to navigate.
@@ -566,6 +567,7 @@
@result A new navigation.
*/
- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request responseHTMLString:(NSString *)string NS_SWIFT_NAME(loadSimulatedRequest(_:responseHTML:)) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (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));
#if !TARGET_OS_IPHONE
/* @abstract Returns an NSPrintOperation object configured to print the contents of this WKWebView
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (277838 => 277839)
--- 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)
@@ -1700,6 +1700,13 @@
return wrapper(_page->loadSimulatedRequest(request, response, { static_cast<const uint8_t*>(data.bytes), data.length }));
}
+// 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];
+}
+
- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request responseHTMLString:(NSString *)string
{
THROW_IF_SUSPENDED;
@@ -1709,6 +1716,13 @@
return [self loadSimulatedRequest:request response:response.get() responseData:data];
}
+// 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];
+}
+
- (WKNavigation *)loadFileRequest:(NSURLRequest *)request allowingReadAccessToURL:(NSURL *)readAccessURL
{
THROW_IF_SUSPENDED;
Modified: trunk/Tools/ChangeLog (277838 => 277839)
--- trunk/Tools/ChangeLog 2021-05-21 00:14:50 UTC (rev 277838)
+++ trunk/Tools/ChangeLog 2021-05-21 00:15:13 UTC (rev 277839)
@@ -1,3 +1,16 @@
+2021-05-20 Alex Christensen <[email protected]>
+
+ 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
+
2021-05-20 Kate Cheney <[email protected]>
Mark ServiceWorkerThreadProxy with a default app-bound value
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm (277838 => 277839)
--- 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)
@@ -52,6 +52,12 @@
[webView loadSimulatedRequest:loadRequest responseHTMLString:htmlString];
[delegate waitForDidFinishNavigation];
+
+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];
}
TEST(WKWebView, LoadSimulatedRequestUsingResponseData)
@@ -68,6 +74,12 @@
[webView loadSimulatedRequest:loadRequest response:response.get() responseData:data];
[delegate waitForDidFinishNavigation];
+
+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];
}
TEST(WKWebView, LoadFileRequest)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
