Post review Weinig fix-ups
Created attachment 348876 [details] Patch
Comment on attachment 348876 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348876&action=review > Source/WebCore/platform/MIMETypeRegistry.cpp:710 > + static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> systemPreviewMIMETypes = std::initializer_list<String> { I think you want to remove the global static above as well. > Source/WebCore/rendering/RenderThemeIOS.mm:1866 > static NSBundle *arKitBundle; > - static dispatch_once_t onceToken; > - dispatch_once(&onceToken, ^{ > + if (!arKitBundle) { > #if PLATFORM(IOS_SIMULATOR) > dlopen("/System/Library/PrivateFrameworks/AssetViewer.framework/AssetViewer", RTLD_NOW); > arKitBundle = [NSBundle bundleForClass:NSClassFromString(@"ASVThumbnailView")]; > #else > arKitBundle = [NSBundle bundleWithURL:[NSURL fileURLWithPath:@"/System/Library/PrivateFrameworks/AssetViewer.framework"]]; > #endif > - }); > + } If you wanted to, you could do this with a lamba, removing the if-statement, but I am not sure it is any better. static NSBundle *arKitBundle = []() { ... return [NSBundle ... }(); > Source/WebCore/rendering/RenderThemeIOS.mm:-1895 > static CGPDFPageRef logoPage; > - static dispatch_once_t onceToken; > - dispatch_once(&onceToken, ^{ > + if (!logoPage) > logoPage = loadARKitPDFPage(@"ARKitBadge").leakRef(); > - }); This could all be one line.
Committed r235651: <https://trac.webkit.org/changeset/235651>
<rdar://problem/44121295>