Cache module-removal descriptor ownership and verify hidden shared skin shortcut

这个提交包含在:
mac 于 2026-11-02 23:41:24 +08:00 提交
1 父节点 72a0269fe7
当前提交 c18a0890ed
2 个文件已更改
+14 -4

没有与搜索条件相匹配的文件

@@ -2,7 +2,7 @@
// actual header actions on isolated hosts, then feed stale state to rendering.
{
auto pumpDeletion=[](){double end=NSProcessInfo.processInfo.systemUptime+.035;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};
BOOL everyButton=YES,everyReset=YES,everyAsset=YES,everyUndo=YES,everyReopen=YES,everyFresh=YES,everyExtra=YES,everyLayout=YES,sharedSkin=YES;
BOOL everyButton=YES,everyReset=YES,everyAsset=YES,everyUndo=YES,everyReopen=YES,everyFresh=YES,everyExtra=YES,everyLayout=YES,sharedSkin=YES,skinShortcut=YES;
for(NSString *type in DYToolTypes()){@autoreleasepool{
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);
NSArray *owned=DYBaseToolDescriptors(type);NSMutableSet *ownedIDs=[NSMutableSet set];
@@ -22,6 +22,7 @@
everyReset&=[host->_values[neighbor[@"pid"]]doubleValue]==19&&[host->_keyframes[neighbor[@"pid"]]intValue]==2&&DYBaseToolRemoved(deleted,type)&&[(NSView *)card[@"view"]isHidden]&&![DYMasksForTool(deleted,[@"base:" stringByAppendingString:type])count]&&[deleted[@"baseMasks"][other]isEqual:doc[@"baseMasks"][other]]&&DYToolWithID(deleted,siblingID)!=nil;
everyUndo&=host->_undoStarts==undo+1&&host->_undoStarts==host->_undoEnds&&!host->_undoActive;
if([type isEqual:@"base"])sharedSkin&=[host->_values[skinPID]intValue]==0&&[host->_keyframes[skinPID]intValue]==4;
if([type isEqual:@"skin"])skinShortcut&=[(NSView *)[view valueForKey:@"controls"][skinPID][@"row"]isHidden];
DYAssetState *cleared=DYReadAssets(host,kCMTimeZero);NSMutableDictionary *expected=[[assets.paths mutableCopy]autorelease];if([type isEqual:@"primary"])[expected removeObjectForKey:@"input"];if([type isEqual:@"look"]){[expected removeObjectForKey:@"look0"];[expected removeObjectForKey:@"look4"];}
everyAsset&=[cleared.paths isEqual:expected]&&([type isEqual:@"spider"]?cleared.spiderMesh==nil&&cleared.spiderLinked:[cleared.spiderMesh isEqual:assets.spiderMesh]&&!cleared.spiderLinked);
NSDictionary *preset=[view presetSnapshot];NSData *toolData=[[[NSData alloc]initWithBase64EncodedString:preset[@"tools"] options:0]autorelease];NSDictionary *presetDoc=[NSPropertyListSerialization propertyListWithData:toolData options:0 format:NULL error:nil];
@@ -43,6 +44,7 @@
run.record(@"deleting-extra-layer-removes-its-state-and-keeps-child-and-neighbor",everyExtra);
run.record(@"narrow-header-keeps-mask-add-delete-and-reset-within-card",everyLayout);
run.record(@"deleting-basic-adjustment-preserves-independent-skin-switch-and-animation",sharedSkin);
run.record(@"deleted-skin-module-hides-its-shared-basic-adjustment-shortcut",skinShortcut);
DYDiagnosticManager *failureHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(failureHost,nil);failureHost->_keyframeQueryFailure=YES;failureHost->_values[@2000]=@2;NSError *resetFailure=nil;run.record(@"keyframe-query-failure-leaves-author-parameters-unchanged",!DYResetToolParameters(failureHost,DYBaseToolDescriptors(@"base"),kCMTimeZero,&resetFailure)&&resetFailure&&[failureHost->_values[@2000]intValue]==2);
NSMutableDictionary *bad=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);bad[@"removedBase"]=@[@"hsl",@"hsl"];run.record(@"removed-base-document-rejects-duplicates",!DYValidToolDocument(bad));bad[@"removedBase"]=@[@"unknown"];run.record(@"removed-base-document-rejects-unknown-modules",!DYValidToolDocument(bad));
// A stale host value from another time must not affect a deleted module.
+11 -3
查看文件
@@ -7,14 +7,22 @@
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"];}
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];}
NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){
static NSArray<NSDictionary *> *DYBuildBaseToolDescriptors(NSString *type){
if(![DYToolTypes()containsObject:type])return @[];NSMutableSet *pids=[NSMutableSet set];
for(NSString *part in DYBaseToolParts(type)){NSDictionary *section=DYToolSection(part);if(section[@"enabled"])[pids addObject:section[@"enabled"]];for(NSDictionary *row in section[@"rows"]){if(row[@"pid"])[pids addObject:row[@"pid"]];if(row[@"enabled"])[pids addObject:row[@"enabled"]];}}
NSMutableArray *result=[NSMutableArray array];for(NSDictionary *d in DYDescriptors()){
NSString *key=d[@"key"];BOOL extra=([type isEqual:@"primary"]&&([key hasPrefix:@"cm"]||[@[@"primaryMasterEnabled",@"inputProfile",@"preLUTStrength"]containsObject:key]))||([type isEqual:@"base"]&&[key isEqual:@"copyAutoGrade"])||([type isEqual:@"look"]&&([key hasPrefix:@"look"]||[key isEqual:@"postLUTStrength"]))||([type isEqual:@"film"]&&[key hasPrefix:@"film"]);
if(extra||[pids containsObject:d[@"pid"]])[result addObject:d];
}return result;
}return [[result copy]autorelease];
}
static NSDictionary *DYToolRemovalCatalog(){
static NSDictionary *catalog;static dispatch_once_t once;dispatch_once(&once,^{
NSMutableDictionary *values=[NSMutableDictionary dictionary],*switches=[NSMutableDictionary dictionary];
for(NSString *type in DYToolTypes()){NSArray *owned=DYBuildBaseToolDescriptors(type);values[type]=owned;NSMutableArray *offsets=[NSMutableArray array];for(NSString *part in DYBaseToolParts(type))for(NSDictionary *d in owned)if([d[@"pid"]isEqual:DYToolSection(part)[@"enabled"]])[offsets addObject:d[@"offset"]];switches[type]=[[offsets copy]autorelease];}
catalog=[@{@"values":values,@"switches":switches}copy];
});return catalog;
}
NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){return DYToolRemovalCatalog()[@"values"][type]?:@[];}
BOOL DYBaseToolRemoved(NSDictionary *doc,NSString *type){return [doc[@"removedBase"]containsObject:type];}
BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
if(!DYValidToolDocument(doc)||![DYToolTypes()containsObject:type])return NO;
@@ -24,7 +32,7 @@ BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){
for(NSString *type in doc[@"removedBase"]){
for(NSDictionary *d in DYBaseToolDescriptors(type))if([d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=[d[@"default"]floatValue];
for(NSString *part in DYBaseToolParts(type))for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(part)[@"enabled"]])*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=0;
for(NSNumber *offset in DYToolRemovalCatalog()[@"switches"][type])*(float*)((uint8_t*)u+offset.unsignedIntegerValue)=0;
if([type isEqual:@"primary"]){u->primarySectionEnabled=0;u->inputProfile=0;u->preLUTStrength=0;}
}
}