Title: [285310] branches/safari-612-branch/Source/WebKit
- Revision
- 285310
- Author
- [email protected]
- Date
- 2021-11-04 14:37:18 -0700 (Thu, 04 Nov 2021)
Log Message
Cherry-pick r284651. rdar://problem/85033593
Call to [NSURL URLByAppendingPathComponent:] under NetworkSessionCocoa() may be inefficient
https://bugs.webkit.org/show_bug.cgi?id=232098
Reviewed by Alex Christensen.
Call [NSURL URLByAppendingPathComponent:isDirectory:] whenever possible instead of
[NSURL URLByAppendingPathComponent], as it is more efficient.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
* UIProcess/Cocoa/WKShareSheet.mm:
(+[WKShareSheet createRandomSharingDirectoryForFile:]):
(+[WKShareSheet writeFileToShareableURL:data:temporaryDirectory:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (285309 => 285310)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-11-04 21:23:10 UTC (rev 285309)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-11-04 21:37:18 UTC (rev 285310)
@@ -1,5 +1,42 @@
2021-11-04 Russell Epstein <[email protected]>
+ Cherry-pick r284651. rdar://problem/85033593
+
+ Call to [NSURL URLByAppendingPathComponent:] under NetworkSessionCocoa() may be inefficient
+ https://bugs.webkit.org/show_bug.cgi?id=232098
+
+ Reviewed by Alex Christensen.
+
+ Call [NSURL URLByAppendingPathComponent:isDirectory:] whenever possible instead of
+ [NSURL URLByAppendingPathComponent], as it is more efficient.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ * UIProcess/Cocoa/WKShareSheet.mm:
+ (+[WKShareSheet createRandomSharingDirectoryForFile:]):
+ (+[WKShareSheet writeFileToShareableURL:data:temporaryDirectory:]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-21 Chris Dumez <[email protected]>
+
+ Call to [NSURL URLByAppendingPathComponent:] under NetworkSessionCocoa() may be inefficient
+ https://bugs.webkit.org/show_bug.cgi?id=232098
+
+ Reviewed by Alex Christensen.
+
+ Call [NSURL URLByAppendingPathComponent:isDirectory:] whenever possible instead of
+ [NSURL URLByAppendingPathComponent], as it is more efficient.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ * UIProcess/Cocoa/WKShareSheet.mm:
+ (+[WKShareSheet createRandomSharingDirectoryForFile:]):
+ (+[WKShareSheet writeFileToShareableURL:data:temporaryDirectory:]):
+
+2021-11-04 Russell Epstein <[email protected]>
+
Cherry-pick r285241. rdar://problem/84990898
[macOS] MediaSession coordinator enabled in UIProcess, disabled in WebContent
Modified: branches/safari-612-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (285309 => 285310)
--- branches/safari-612-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-11-04 21:23:10 UTC (rev 285309)
+++ branches/safari-612-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-11-04 21:37:18 UTC (rev 285310)
@@ -1316,7 +1316,7 @@
#if HAVE(CFNETWORK_ALTERNATIVE_SERVICE)
if (!parameters.alternativeServiceDirectory.isEmpty()) {
SandboxExtension::consumePermanently(parameters.alternativeServiceDirectoryExtensionHandle);
- configuration._alternativeServicesStorage = adoptNS([[_NSHTTPAlternativeServicesStorage alloc] initPersistentStoreWithURL:[[NSURL fileURLWithPath:parameters.alternativeServiceDirectory isDirectory:YES] URLByAppendingPathComponent:@"AlternativeService.sqlite"]]).get();
+ configuration._alternativeServicesStorage = adoptNS([[_NSHTTPAlternativeServicesStorage alloc] initPersistentStoreWithURL:[[NSURL fileURLWithPath:parameters.alternativeServiceDirectory isDirectory:YES] URLByAppendingPathComponent:@"AlternativeService.sqlite" isDirectory:NO]]).get();
}
if (parameters.http3Enabled)
configuration._allowsHTTP3 = YES;
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm (285309 => 285310)
--- branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2021-11-04 21:23:10 UTC (rev 285309)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2021-11-04 21:37:18 UTC (rev 285310)
@@ -329,7 +329,7 @@
NSString *randomDirectory = createCanonicalUUIDString();
if (![randomDirectory length] || !temporaryDirectory)
return nil;
- NSURL *dataPath = [temporaryDirectory URLByAppendingPathComponent:randomDirectory];
+ NSURL *dataPath = [temporaryDirectory URLByAppendingPathComponent:randomDirectory isDirectory:YES];
if (![[NSFileManager defaultManager] createDirectoryAtURL:dataPath withIntermediateDirectories:NO attributes:nil error:nil])
return nil;
@@ -346,7 +346,7 @@
if (!temporaryDirectoryForFile)
return nil;
- NSURL *fileURL = [temporaryDirectoryForFile URLByAppendingPathComponent:fileName];
+ NSURL *fileURL = [temporaryDirectoryForFile URLByAppendingPathComponent:fileName isDirectory:NO];
if (![fileData writeToURL:fileURL options:NSDataWritingAtomic error:nil])
return nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
