Title: [285059] trunk
- Revision
- 285059
- Author
- [email protected]
- Date
- 2021-10-29 16:17:10 -0700 (Fri, 29 Oct 2021)
Log Message
Unreviewed, reverting r284917.
Source/WebCore/PAL:
Likely caused significant performance regression
Reverted changeset:
"Remove properties set by NSURLProtocol on NSURLRequest before
serializing"
https://bugs.webkit.org/show_bug.cgi?id=232332
https://commits.webkit.org/r284917
Source/WebKit:
<rdar://84807461>
Likely caused significant performance regression
Reverted changeset:
"Remove properties set by NSURLProtocol on NSURLRequest before
serializing"
https://bugs.webkit.org/show_bug.cgi?id=232332
https://commits.webkit.org/r284917
Tools:
Likely caused significant performance regression
Reverted changeset:
"Remove properties set by NSURLProtocol on NSURLRequest before
serializing"
https://bugs.webkit.org/show_bug.cgi?id=232332
https://commits.webkit.org/r284917
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (285058 => 285059)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-10-29 23:17:10 UTC (rev 285059)
@@ -1,3 +1,16 @@
+2021-10-29 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r284917.
+
+ Likely caused significant performance regression
+
+ Reverted changeset:
+
+ "Remove properties set by NSURLProtocol on NSURLRequest before
+ serializing"
+ https://bugs.webkit.org/show_bug.cgi?id=232332
+ https://commits.webkit.org/r284917
+
2021-10-26 Alex Christensen <[email protected]>
Remove properties set by NSURLProtocol on NSURLRequest before serializing
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (285058 => 285059)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-10-29 23:17:10 UTC (rev 285059)
@@ -500,12 +500,4 @@
- (void)_sendCloseCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData *)reason;
@end
-@interface NSMutableURLRequest (Staging_83855325)
-- (void)_removeAllProtocolProperties;
-@end
-
-@interface NSURLRequest (Staging_83857142)
-@property (nonatomic, readonly, nullable, retain) NSDictionary<NSString *, id> *_allProtocolProperties;
-@end
-
#endif // defined(__OBJC__)
Modified: trunk/Source/WebKit/ChangeLog (285058 => 285059)
--- trunk/Source/WebKit/ChangeLog 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Source/WebKit/ChangeLog 2021-10-29 23:17:10 UTC (rev 285059)
@@ -1,3 +1,17 @@
+2021-10-29 Alex Christensen <[email protected]>
+
+ Unreviewed, reverting r284917.
+ <rdar://84807461>
+
+ Likely caused significant performance regression
+
+ Reverted changeset:
+
+ "Remove properties set by NSURLProtocol on NSURLRequest before
+ serializing"
+ https://bugs.webkit.org/show_bug.cgi?id=232332
+ https://commits.webkit.org/r284917
+
2021-10-29 John Pascoe <[email protected]>
Add last modified and creation time to +[_WKWebAuthenticationPanel getAllLocalAuthenticatorCredentials]
Modified: trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (285058 => 285059)
--- trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2021-10-29 23:17:10 UTC (rev 285059)
@@ -37,7 +37,6 @@
#import <WebCore/FontCustomPlatformData.h>
#import <WebCore/ResourceRequest.h>
#import <WebCore/TextRecognitionResult.h>
-#import <pal/spi/cf/CFNetworkSPI.h>
#import <pal/spi/cf/CoreTextSPI.h>
#if PLATFORM(IOS_FAMILY)
@@ -627,18 +626,10 @@
// We don't send HTTP body over IPC for better performance.
// Also, it's not always possible to do, as streams can only be created in process that does networking.
- bool hasHTTPBody = [requestToSerialize HTTPBody] || [requestToSerialize HTTPBodyStream];
-
- // FIXME: Replace this respondsToSelector check with a HAS macro once rdar://83857142 has been put in a build and the bots are updated.
- bool hasProtocolProperties = [requestToSerialize respondsToSelector:@selector(_allProtocolProperties)] && [requestToSerialize _allProtocolProperties];
-
- if (hasHTTPBody || hasProtocolProperties) {
+ if ([requestToSerialize HTTPBody] || [requestToSerialize HTTPBodyStream]) {
auto mutableRequest = adoptNS([requestToSerialize mutableCopy]);
[mutableRequest setHTTPBody:nil];
[mutableRequest setHTTPBodyStream:nil];
- // FIXME: Replace this respondsToSelector check with a HAS macro once rdar://83855325 has been put in a build and the bots are updated.
- if ([mutableRequest respondsToSelector:@selector(_removeAllProtocolProperties)])
- [mutableRequest _removeAllProtocolProperties];
requestToSerialize = WTFMove(mutableRequest);
}
Modified: trunk/Tools/ChangeLog (285058 => 285059)
--- trunk/Tools/ChangeLog 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Tools/ChangeLog 2021-10-29 23:17:10 UTC (rev 285059)
@@ -1,5 +1,18 @@
2021-10-29 Alex Christensen <[email protected]>
+ Unreviewed, reverting r284917.
+
+ Likely caused significant performance regression
+
+ Reverted changeset:
+
+ "Remove properties set by NSURLProtocol on NSURLRequest before
+ serializing"
+ https://bugs.webkit.org/show_bug.cgi?id=232332
+ https://commits.webkit.org/r284917
+
+2021-10-29 Alex Christensen <[email protected]>
+
Fix AppleWin build after r285051
​https://bugs.webkit.org/show_bug.cgi?id=232462
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm (285058 => 285059)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm 2021-10-29 22:21:24 UTC (rev 285058)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm 2021-10-29 23:17:10 UTC (rev 285059)
@@ -137,26 +137,5 @@
[webView _test_waitForDidFinishNavigation];
}
-TEST(WebKit, LoadNSURLRequestWithProtocolProperties)
-{
- auto request = adoptNS([[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:@"test:///"]]);
-
- // FIXME: Replace this with a HAS macro once rdar://83857142 has been put in a build and the bots are updated.
- bool hasRadar83857142 = [request respondsToSelector:@selector(_allProtocolProperties)];
-
- [NSURLProtocol setProperty:@"world" forKey:@"hello" inRequest:request.get()];
- auto handler = adoptNS([TestURLSchemeHandler new]);
- __block bool done = false;
- handler.get().startURLSchemeTaskHandler = ^(WKWebView *, id<WKURLSchemeTask> task) {
- EXPECT_EQ(hasRadar83857142, ![NSURLProtocol propertyForKey:@"hello" inRequest:task.request]);
- done = true;
- };
- auto configuration = adoptNS([WKWebViewConfiguration new]);
- [configuration setURLSchemeHandler:handler.get() forURLScheme:@"test"];
- auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration.get()]);
- [webView loadRequest:request.get()];
- Util::run(&done);
-}
-
} // namespace TestWebKitAPI
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
