Title: [273924] trunk/Source/WebKit
- Revision
- 273924
- Author
- timothy_hor...@apple.com
- Date
- 2021-03-04 15:22:29 -0800 (Thu, 04 Mar 2021)
Log Message
Fix the build after r273904
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::setPreferenceValue):
auto's evilness rears its head again. -mutableCopy returns `id`, so
we infer RetainPtr<id>, so depending on what headers are included
we get ambiguous selector errors. De-auto to fix.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (273923 => 273924)
--- trunk/Source/WebKit/ChangeLog 2021-03-04 23:14:54 UTC (rev 273923)
+++ trunk/Source/WebKit/ChangeLog 2021-03-04 23:22:29 UTC (rev 273924)
@@ -1,3 +1,13 @@
+2021-03-04 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build after r273904
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::setPreferenceValue):
+ auto's evilness rears its head again. -mutableCopy returns `id`, so
+ we infer RetainPtr<id>, so depending on what headers are included
+ we get ambiguous selector errors. De-auto to fix.
+
2021-03-04 Chris Dumez <cdu...@apple.com>
Clean up API::ResourceLoadStatisticsThirdParty / API::ResourceLoadStatisticsFirstParty
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (273923 => 273924)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-03-04 23:14:54 UTC (rev 273923)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-03-04 23:22:29 UTC (rev 273924)
@@ -1109,7 +1109,7 @@
if (key == "AppleLanguages") {
// We need to set AppleLanguages for the volatile domain, similarly to what we do in XPCServiceMain.mm.
NSDictionary *existingArguments = [[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain];
- auto newArguments = adoptNS([existingArguments mutableCopy]);
+ RetainPtr<NSMutableDictionary> newArguments = adoptNS([existingArguments mutableCopy]);
[newArguments setValue:value forKey:@"AppleLanguages"];
[[NSUserDefaults standardUserDefaults] setVolatileDomain:newArguments.get() forName:NSArgumentDomain];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
