Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep the atomics - does not affect memory reduction work #1498

Merged
merged 2 commits into from
May 8, 2019
Merged

Keep the atomics - does not affect memory reduction work #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3820a43
Keep the atomics - does not affect memory work
May 7, 2019
52d0b89
Merge remote-tracking branch 'origin/master' into RevertStuff
May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Source/ASControlNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

#pragma once

#pragma clang diagnostic push
#pragma clang diagnostic error "-Wobjc-missing-property-synthesis"

NS_ASSUME_NONNULL_BEGIN

/**
Expand Down Expand Up @@ -150,5 +147,3 @@ static UIControlState const ASControlStateSelected ASDISPLAYNODE_DEPRECATED_MSG(
#endif

NS_ASSUME_NONNULL_END

#pragma clang diagnostic pop
63 changes: 0 additions & 63 deletions Source/ASControlNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ @interface ASControlNode ()
// Control Attributes
BOOL _enabled;
BOOL _highlighted;
BOOL _selected;

// Tracking
BOOL _tracking;
Expand Down Expand Up @@ -122,68 +121,6 @@ - (void)__exitHierarchy
}
}

#pragma mark - ASDisplayNode Overrides

- (BOOL)isEnabled
{
ASLockScopeSelf();
return _enabled;
}

- (void)setEnabled:(BOOL)enabled
{
ASLockScopeSelf();
_enabled = enabled;
}

- (BOOL)isHighlighted
{
ASLockScopeSelf();
return _highlighted;
}

- (void)setHighlighted:(BOOL)highlighted
{
ASLockScopeSelf();
_highlighted = highlighted;
}

- (void)setSelected:(BOOL)selected
{
ASLockScopeSelf();
_selected = selected;
}

- (BOOL)isSelected
{
ASLockScopeSelf();
return _selected;
}

- (void)setTracking:(BOOL)tracking
{
ASLockScopeSelf();
_tracking = tracking;
}

- (BOOL)isTracking
{
ASLockScopeSelf();
return _tracking;
}

- (void)setTouchInside:(BOOL)touchInside
{
ASLockScopeSelf();
_touchInside = touchInside;
}

- (BOOL)isTouchInside
{
ASLockScopeSelf();
return _touchInside;
}

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"

Expand Down
5 changes: 0 additions & 5 deletions Source/ASDisplayNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#import <AsyncDisplayKit/ASLayoutElement.h>
#import <AsyncDisplayKit/ASLocking.h>

#pragma clang diagnostic push
#pragma clang diagnostic error "-Wobjc-missing-property-synthesis"

NS_ASSUME_NONNULL_BEGIN

#define ASDisplayNodeLoggingEnabled 0
Expand Down Expand Up @@ -990,5 +987,3 @@ typedef NS_ENUM(NSInteger, ASLayoutEngineType) {
@end

NS_ASSUME_NONNULL_END

#pragma clang diagnostic pop
36 changes: 0 additions & 36 deletions Source/ASDisplayNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2634,42 +2634,6 @@ - (BOOL)placeholderShouldPersist
return NO;
}

- (BOOL)placeholderEnabled
{
MutexLocker l(__instanceLock__);
return _flags.placeholderEnabled;
}

- (void)setPlaceholderEnabled:(BOOL)placeholderEnabled
{
MutexLocker l(__instanceLock__);
_flags.placeholderEnabled = placeholderEnabled;
}

- (NSTimeInterval)placeholderFadeDuration
{
MutexLocker l(__instanceLock__);
return _placeholderFadeDuration;
}

- (void)setPlaceholderFadeDuration:(NSTimeInterval)placeholderFadeDuration
{
MutexLocker l(__instanceLock__);
_placeholderFadeDuration = placeholderFadeDuration;
}

- (NSInteger)drawingPriority
{
MutexLocker l(__instanceLock__);
return _drawingPriority;
}

- (void)setDrawingPriority:(NSInteger)drawingPriority
{
MutexLocker l(__instanceLock__);
_drawingPriority = drawingPriority;
}

#pragma mark - Hierarchy State

- (BOOL)isInHierarchy
Expand Down
3 changes: 0 additions & 3 deletions Source/Private/ASDisplayNodeInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,6 @@ static constexpr CACornerMask kASCACornerAllCorners =
// Placeholder support
UIImage *_placeholderImage;
CALayer *_placeholderLayer;
NSTimeInterval _placeholderFadeDuration;

NSInteger _drawingPriority;

// keeps track of nodes/subnodes that have not finished display, used with placeholders
ASWeakSet *_pendingDisplayNodes;
Expand Down