Add missing instance variables in ASTextNode and warnings cleanup #trivial (#984)

* Add missing instance variables in ASTextNode and warnings cleanup

* Re-add drain
This commit is contained in:
Michael Schneider
2018-06-24 08:56:10 -07:00
committed by GitHub
parent 37e82132be
commit b82128ee4e
4 changed files with 33 additions and 3 deletions

View File

@@ -216,6 +216,6 @@ AS_EXTERN void ASDisplayNodeDisableHierarchyNotifications(ASDisplayNode *node);
AS_EXTERN void ASDisplayNodeEnableHierarchyNotifications(ASDisplayNode *node);
// Not to be called directly.
AS_EXTERN void _ASSetDebugNames(Class owningClass, NSString *names, ASDisplayNode *object, ...);
AS_EXTERN void _ASSetDebugNames(Class owningClass, NSString *names, ASDisplayNode * _Nullable object, ...);
NS_ASSUME_NONNULL_END

View File

@@ -65,6 +65,11 @@ static void runLoopSourceCallback(void *info) {
ASDisplayNodeFailAssert(@"Abstract method.");
}
- (void)drain
{
ASDisplayNodeFailAssert(@"Abstract method.");
}
@end
@implementation ASDeallocQueueV1 {

View File

@@ -191,7 +191,12 @@ static ASTextKitRenderer *rendererForAttributes(ASTextKitAttributes attributes,
NSAttributedString *_attributedText;
NSAttributedString *_truncationAttributedText;
NSAttributedString *_additionalTruncationMessage;
NSAttributedString *_composedTruncationText;
NSArray<NSNumber *> *_pointSizeScaleFactors;
NSLineBreakMode _truncationMode;
NSUInteger _maximumNumberOfLines;
NSString *_highlightedLinkAttributeName;
id _highlightedLinkAttributeValue;
@@ -1175,6 +1180,11 @@ static NSAttributedString *DefaultTruncationAttributedString()
}
}
- (NSAttributedString *)additionalTruncationMessage
{
return ASLockedSelf(_additionalTruncationMessage);
}
- (void)setTruncationMode:(NSLineBreakMode)truncationMode
{
if (ASLockedSelfCompareAssign(_truncationMode, truncationMode)) {
@@ -1182,18 +1192,28 @@ static NSAttributedString *DefaultTruncationAttributedString()
}
}
- (NSLineBreakMode)truncationMode
{
return ASLockedSelf(_truncationMode);
}
- (BOOL)isTruncated
{
return ASLockedSelf([[self _locked_renderer] isTruncated]);
}
- (void)setPointSizeScaleFactors:(NSArray *)pointSizeScaleFactors
- (void)setPointSizeScaleFactors:(NSArray<NSNumber *> *)pointSizeScaleFactors
{
if (ASLockedSelfCompareAssignCopy(_pointSizeScaleFactors, pointSizeScaleFactors)) {
[self setNeedsDisplay];
}
}
- (NSArray<NSNumber *> *)pointSizeScaleFactors
{
return ASLockedSelf(_pointSizeScaleFactors);
}
- (void)setMaximumNumberOfLines:(NSUInteger)maximumNumberOfLines
{
if (ASLockedSelfCompareAssign(_maximumNumberOfLines, maximumNumberOfLines)) {
@@ -1201,6 +1221,11 @@ static NSAttributedString *DefaultTruncationAttributedString()
}
}
- (NSUInteger)maximumNumberOfLines
{
return ASLockedSelf(_maximumNumberOfLines);
}
- (NSUInteger)lineCount
{
return ASLockedSelf([[self _locked_renderer] lineCount]);

View File

@@ -950,7 +950,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ];
}
}
- (NSArray *)pointSizeScaleFactors
- (NSArray<NSNumber *> *)pointSizeScaleFactors
{
return ASLockedSelf(_pointSizeScaleFactors);
}