Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 2dca7a0

Browse files
maickimaicki
authored
[Debug] Remove not used code around visualizing layout specs (#2991)
* Remove not used code around visualizing layout specs * This is sad to see but let’s remove the LayoutSpecPlayground for now
1 parent 77f29a8 commit 2dca7a0

37 files changed

Lines changed: 13 additions & 2912 deletions

‎AsyncDisplayKit.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,6 @@
352352
DE7EF4F81DFF77720082B84A /* ASDisplayNode+FrameworkSubclasses.h in Headers */ = {isa = PBXBuildFile; fileRef = DE7EF4F71DFF77720082B84A /* ASDisplayNode+FrameworkSubclasses.h */; settings = {ATTRIBUTES = (Private, ); }; };
353353
DE84918D1C8FFF2B003D89E9 /* ASRunLoopQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EE384D1C8E94F000456208 /* ASRunLoopQueue.h */; settings = {ATTRIBUTES = (Public, ); }; };
354354
DE84918E1C8FFF9F003D89E9 /* ASRunLoopQueue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 81EE384E1C8E94F000456208 /* ASRunLoopQueue.mm */; };
355-
DE89C1701DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.h in Headers */ = {isa = PBXBuildFile; fileRef = DE89C16A1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.h */; settings = {ATTRIBUTES = (Private, ); }; };
356-
DE89C1731DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DE89C16B1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.m */; };
357-
DE89C1741DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = DE89C16C1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
358-
DE89C1771DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.m in Sources */ = {isa = PBXBuildFile; fileRef = DE89C16D1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.m */; };
359-
DE89C1781DCEB9CC00D49D74 /* ASLayoutSpec+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = DE89C16E1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.h */; settings = {ATTRIBUTES = (Private, ); }; };
360-
DE89C17B1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.m in Sources */ = {isa = PBXBuildFile; fileRef = DE89C16F1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.m */; };
361355
DE8BEAC21C2DF3FC00D57C12 /* ASDelegateProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = DE8BEABF1C2DF3FC00D57C12 /* ASDelegateProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
362356
DE8BEAC41C2DF3FC00D57C12 /* ASDelegateProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8BEAC01C2DF3FC00D57C12 /* ASDelegateProxy.m */; };
363357
DEB8ED7C1DD003D300DBDE55 /* ASLayoutTransition.mm in Sources */ = {isa = PBXBuildFile; fileRef = E52405B21C8FEF03004DC8E7 /* ASLayoutTransition.mm */; };
@@ -749,12 +743,6 @@
749743
DBDB83931C6E879900D0098C /* ASPagerFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASPagerFlowLayout.m; sourceTree = "<group>"; };
750744
DE6EA3211C14000600183B10 /* ASDisplayNode+FrameworkPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASDisplayNode+FrameworkPrivate.h"; sourceTree = "<group>"; };
751745
DE7EF4F71DFF77720082B84A /* ASDisplayNode+FrameworkSubclasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASDisplayNode+FrameworkSubclasses.h"; sourceTree = "<group>"; };
752-
DE89C16A1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutElementInspectorCell.h; sourceTree = "<group>"; };
753-
DE89C16B1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASLayoutElementInspectorCell.m; sourceTree = "<group>"; };
754-
DE89C16C1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutElementInspectorNode.h; sourceTree = "<group>"; };
755-
DE89C16D1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASLayoutElementInspectorNode.m; sourceTree = "<group>"; };
756-
DE89C16E1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASLayoutSpec+Debug.h"; sourceTree = "<group>"; };
757-
DE89C16F1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ASLayoutSpec+Debug.m"; sourceTree = "<group>"; };
758746
DE8BEABF1C2DF3FC00D57C12 /* ASDelegateProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASDelegateProxy.h; sourceTree = "<group>"; };
759747
DE8BEAC01C2DF3FC00D57C12 /* ASDelegateProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASDelegateProxy.m; sourceTree = "<group>"; };
760748
DEC146B41C37A16A004A0EE7 /* ASCollectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCollectionInternal.h; path = Details/ASCollectionInternal.h; sourceTree = "<group>"; };
@@ -1356,12 +1344,6 @@
13561344
DE89C1691DCEB9CC00D49D74 /* Debug */ = {
13571345
isa = PBXGroup;
13581346
children = (
1359-
DE89C16A1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.h */,
1360-
DE89C16B1DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.m */,
1361-
DE89C16C1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.h */,
1362-
DE89C16D1DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.m */,
1363-
DE89C16E1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.h */,
1364-
DE89C16F1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.m */,
13651347
764D83D21C8EA515009B4FB8 /* AsyncDisplayKit+Debug.h */,
13661348
764D83D31C8EA515009B4FB8 /* AsyncDisplayKit+Debug.m */,
13671349
);
@@ -1449,7 +1431,6 @@
14491431
698DFF471E36B7E9002891F1 /* ASLayoutSpecUtilities.h in Headers */,
14501432
9C70F20D1CDBE9CB007D6C76 /* ASDefaultPlayButton.h in Headers */,
14511433
DE7EF4F81DFF77720082B84A /* ASDisplayNode+FrameworkSubclasses.h in Headers */,
1452-
DE89C1741DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.h in Headers */,
14531434
254C6B7E1BF94DF4003EC431 /* ASTextKitTailTruncater.h in Headers */,
14541435
B35062491B010EFD0018CF92 /* _ASCoreAnimationExtras.h in Headers */,
14551436
68EE0DBE1C1B4ED300BA1B99 /* ASMainSerialQueue.h in Headers */,
@@ -1501,7 +1482,6 @@
15011482
690ED5991E36D118000627C0 /* ASImageNode+tvOS.h in Headers */,
15021483
254C6B741BF94DF4003EC431 /* ASTextNodeWordKerner.h in Headers */,
15031484
698DFF441E36B6C9002891F1 /* ASStackLayoutSpecUtilities.h in Headers */,
1504-
DE89C1781DCEB9CC00D49D74 /* ASLayoutSpec+Debug.h in Headers */,
15051485
CCF18FF41D2575E300DF5895 /* NSIndexSet+ASHelpers.h in Headers */,
15061486
83A7D95C1D44548100BF333E /* ASWeakMap.h in Headers */,
15071487
69708BA61D76386D005C3CF9 /* ASEqualityHashHelpers.h in Headers */,
@@ -1511,7 +1491,6 @@
15111491
254C6B7B1BF94DF4003EC431 /* ASTextKitRenderer+Positioning.h in Headers */,
15121492
DE4843DC1C93EAC100A1F33B /* ASLayoutTransition.h in Headers */,
15131493
CC57EAF81E3939450034C595 /* ASTableView+Undeprecated.h in Headers */,
1514-
DE89C1701DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.h in Headers */,
15151494
254C6B781BF94DF4003EC431 /* ASTextKitContext.h in Headers */,
15161495
9CDC18CD1B910E12004965E2 /* ASLayoutElementPrivate.h in Headers */,
15171496
B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */,
@@ -1875,7 +1854,6 @@
18751854
B350621C1B010EFD0018CF92 /* ASTableLayoutController.m in Sources */,
18761855
B350621E1B010EFD0018CF92 /* ASHighlightOverlayLayer.mm in Sources */,
18771856
9CC606651D24DF9E006581A0 /* NSIndexSet+ASHelpers.m in Sources */,
1878-
DE89C17B1DCEB9CC00D49D74 /* ASLayoutSpec+Debug.m in Sources */,
18791857
CC0F885F1E4280B800576FED /* _ASCollectionViewCell.m in Sources */,
18801858
B35062541B010EFD0018CF92 /* ASImageNode+CGExtras.m in Sources */,
18811859
6947B0C01E36B4E30007C478 /* ASStackUnpositionedLayout.mm in Sources */,
@@ -1897,7 +1875,6 @@
18971875
B35062071B010EFD0018CF92 /* ASNetworkImageNode.mm in Sources */,
18981876
34EFC76D1B701CF100AD841F /* ASOverlayLayoutSpec.mm in Sources */,
18991877
044285101BAA64EC00D16268 /* ASMultidimensionalArrayUtils.mm in Sources */,
1900-
DE89C1731DCEB9CC00D49D74 /* ASLayoutElementInspectorCell.m in Sources */,
19011878
B35062271B010EFD0018CF92 /* ASRangeController.mm in Sources */,
19021879
0442850A1BAA63FE00D16268 /* ASBatchFetching.m in Sources */,
19031880
68FC85E61CE29B9400EDD713 /* ASNavigationController.m in Sources */,
@@ -1933,7 +1910,6 @@
19331910
044284FD1BAA365100D16268 /* UICollectionViewLayout+ASConvenience.m in Sources */,
19341911
CC0F885B1E42807F00576FED /* ASCollectionViewFlowLayoutInspector.m in Sources */,
19351912
690ED5981E36D118000627C0 /* ASControlNode+tvOS.m in Sources */,
1936-
DE89C1771DCEB9CC00D49D74 /* ASLayoutElementInspectorNode.m in Sources */,
19371913
254C6B8A1BF94F8A003EC431 /* ASTextKitRenderer+TextChecking.mm in Sources */,
19381914
);
19391915
runOnlyForDeploymentPostprocessing = 0;

‎AsyncDisplayKit/ASControlNode.mm‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#import <AsyncDisplayKit/ASInternalHelpers.h>
1616
#import <AsyncDisplayKit/ASControlTargetAction.h>
1717
#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
18-
#import <AsyncDisplayKit/ASLayoutElementInspectorNode.h>
1918
#import <AsyncDisplayKit/ASThread.h>
2019

2120
// UIControl allows dragging some distance outside of the control itself during
@@ -465,22 +464,4 @@ - (ASImageNode *)debugHighlightOverlay
465464
{
466465
return _debugHighlightOverlay;
467466
}
468-
469-
// methods for visualizing ASLayoutSpecs
470-
- (void)setHierarchyState:(ASHierarchyState)hierarchyState
471-
{
472-
[super setHierarchyState:hierarchyState];
473-
474-
if (self.shouldVisualizeLayoutSpecs) {
475-
[self addTarget:self action:@selector(inspectElement) forControlEvents:ASControlNodeEventTouchUpInside];
476-
} else {
477-
[self removeTarget:self action:@selector(inspectElement) forControlEvents:ASControlNodeEventTouchUpInside];
478-
}
479-
}
480-
481-
- (void)inspectElement
482-
{
483-
[ASLayoutElementInspectorNode sharedInstance].layoutElementToEdit = self;
484-
}
485-
486467
@end

‎AsyncDisplayKit/ASDisplayNode.mm‎

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -972,19 +972,11 @@ - (void)_locked_measureNodeWithBoundsIfNecessary:(CGRect)bounds
972972
[self cancelLayoutTransition];
973973

974974
BOOL didCreateNewContext = NO;
975-
BOOL didOverrideExistingContext = NO;
976-
BOOL shouldVisualizeLayout = ASHierarchyStateIncludesVisualizeLayout(_hierarchyState);
977975
ASLayoutElementContext context = ASLayoutElementGetCurrentContext();
978976
if (ASLayoutElementContextIsNull(context)) {
979-
context = ASLayoutElementContextMake(ASLayoutElementContextDefaultTransitionID, shouldVisualizeLayout);
977+
context = ASLayoutElementContextMake(ASLayoutElementContextDefaultTransitionID);
980978
ASLayoutElementSetCurrentContext(context);
981979
didCreateNewContext = YES;
982-
} else {
983-
if (context.needsVisualizeNode != shouldVisualizeLayout) {
984-
context.needsVisualizeNode = shouldVisualizeLayout;
985-
ASLayoutElementSetCurrentContext(context);
986-
didOverrideExistingContext = YES;
987-
}
988980
}
989981

990982
// Figure out previous and pending layouts for layout transition
@@ -1005,9 +997,6 @@ - (void)_locked_measureNodeWithBoundsIfNecessary:(CGRect)bounds
1005997

1006998
if (didCreateNewContext) {
1007999
ASLayoutElementClearCurrentContext();
1008-
} else if (didOverrideExistingContext) {
1009-
context.needsVisualizeNode = !context.needsVisualizeNode;
1010-
ASLayoutElementSetCurrentContext(context);
10111000
}
10121001

10131002
// If our new layout's desired size for self doesn't match current size, ask our parent to update it.
@@ -1125,11 +1114,7 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
11251114
}
11261115
#endif
11271116

1128-
if (_shouldCacheLayoutSpec) {
1129-
_layoutSpec = layoutSpec;
1130-
} else {
1131-
ASDisplayNodeAssert(layoutSpec.isMutable, @"Node %@ returned layout spec %@ that has already been used. Layout specs should always be regenerated.", self, layoutSpec);
1132-
}
1117+
ASDisplayNodeAssert(layoutSpec.isMutable, @"Node %@ returned layout spec %@ that has already been used. Layout specs should always be regenerated.", self, layoutSpec);
11331118

11341119
layoutSpec.isMutable = NO;
11351120
}
@@ -1183,9 +1168,7 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
11831168

11841169
BOOL measureLayoutSpec = _measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutSpec;
11851170

1186-
if (_shouldCacheLayoutSpec && _layoutSpec != nil) {
1187-
return _layoutSpec;
1188-
} else if (_layoutSpecBlock != NULL) {
1171+
if (_layoutSpecBlock != NULL) {
11891172
return ({
11901173
ASDN::MutexLocker l(__instanceLock__);
11911174
ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
@@ -1417,9 +1400,8 @@ - (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
14171400
ASLayout *newLayout;
14181401
{
14191402
ASDN::MutexLocker l(__instanceLock__);
1420-
1421-
BOOL shouldVisualizeLayout = ASHierarchyStateIncludesVisualizeLayout(_hierarchyState);
1422-
ASLayoutElementSetCurrentContext(ASLayoutElementContextMake(transitionID, shouldVisualizeLayout));
1403+
1404+
ASLayoutElementSetCurrentContext(ASLayoutElementContextMake(transitionID));
14231405

14241406
BOOL automaticallyManagesSubnodesDisabled = (self.automaticallyManagesSubnodes == NO);
14251407
self.automaticallyManagesSubnodes = YES; // Temporary flag for 1.9.x
@@ -4004,44 +3986,6 @@ - (NSString *)asciiArtName
40043986
return string;
40053987
}
40063988

4007-
#pragma mark - ASDisplayNode (Visualization)
4008-
4009-
- (void)setShouldVisualizeLayoutSpecs:(BOOL)shouldVisualizeLayoutSpecs
4010-
{
4011-
ASDN::MutexLocker l(__instanceLock__);
4012-
if (shouldVisualizeLayoutSpecs != [self shouldVisualizeLayoutSpecs]) {
4013-
if (shouldVisualizeLayoutSpecs) {
4014-
[self enterHierarchyState:ASHierarchyStateVisualizeLayout];
4015-
} else {
4016-
[self exitHierarchyState:ASHierarchyStateVisualizeLayout];
4017-
}
4018-
[self setNeedsLayout];
4019-
}
4020-
}
4021-
4022-
- (BOOL)shouldVisualizeLayoutSpecs
4023-
{
4024-
ASDN::MutexLocker l(__instanceLock__);
4025-
return ASHierarchyStateIncludesVisualizeLayout(_hierarchyState);
4026-
}
4027-
4028-
- (void)setShouldCacheLayoutSpec:(BOOL)shouldCacheLayoutSpec
4029-
{
4030-
ASDN::MutexLocker l(__instanceLock__);
4031-
if (_shouldCacheLayoutSpec != shouldCacheLayoutSpec) {
4032-
_shouldCacheLayoutSpec = shouldCacheLayoutSpec;
4033-
if (_shouldCacheLayoutSpec == NO) {
4034-
_layoutSpec = nil;
4035-
}
4036-
}
4037-
}
4038-
4039-
- (BOOL)shouldCacheLayoutSpec
4040-
{
4041-
ASDN::MutexLocker l(__instanceLock__);
4042-
return _shouldCacheLayoutSpec;
4043-
}
4044-
40453989
@end
40463990

40473991
#pragma mark - ASDisplayNode UIKit / CA Categories

‎AsyncDisplayKit/AsyncDisplayKit+Debug.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
NS_ASSUME_NONNULL_BEGIN
1919

20-
@interface ASDisplayNode (Visualization)
21-
@property (nonatomic, assign) BOOL shouldVisualizeLayoutSpecs;
22-
@property (nonatomic, assign) BOOL shouldCacheLayoutSpec;
23-
24-
@end
25-
2620
@interface ASImageNode (Debugging)
2721

2822
/**

‎AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)