[ASTextNode, ASImageNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization (#1877)

* [ASTextNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization

* fix headers to match master

* address @appleguy, @maicki comments

* import header

* Swap lock in ASNetworkImageNode as well

* remove invalid comment

* more cleanup of locks

Author: Hannah Troisi

AsyncDisplayKit/ASImageNode.mm

@@ -44,7 +44,6 @@ @implementation ASImageNode
   UIImage *_image;
 
   void (^_displayCompletionBlock)(BOOL canceled);
-  ASDN::RecursiveMutex _imageLock;
 
   // Drawing
   ASImageNodeDrawParameters _drawParameter;
@@ -119,7 +118,7 @@ - (void)dealloc
 
 - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   // if a preferredFrameSize is set, call the superclass to return that instead of using the image size.
   if (CGSizeEqualToSize(self.preferredFrameSize, CGSizeZero) == NO)
     return [super calculateSizeThatFits:constrainedSize];
@@ -133,11 +132,9 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
 
 - (void)setImage:(UIImage *)image
 {
-  _imageLock.lock();
+  ASDN::MutexLocker l(_propertyLock);
   if (!ASObjectIsEqual(_image, image)) {
     _image = image;
-
-    _imageLock.unlock();
 
     [self invalidateCalculatedLayout];
     if (image) {
@@ -153,14 +150,12 @@ - (void)setImage:(UIImage *)image
     } else {
       self.contents = nil;
     }
-  } else {
-    _imageLock.unlock(); // We avoid using MutexUnlocker as it needlessly re-locks at the end of the scope.
   }
 }
 
 - (UIImage *)image
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   return _image;
 }
 
@@ -176,7 +171,7 @@ - (void)setPlaceholderColor:(UIColor *)placeholderColor
 
 - (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
 
   _drawParameter = {
     .bounds = self.bounds,
@@ -221,7 +216,7 @@ - (UIImage *)displayWithParameters:(id<NSObject> *)parameter isCancelled:(asdisp
   asimagenode_modification_block_t imageModificationBlock;
 
   {
-    ASDN::MutexLocker l(_imageLock);
+    ASDN::MutexLocker l(_propertyLock);
     ASImageNodeDrawParameters drawParameter = _drawParameter;
 
     drawParameterBounds       = drawParameter.bounds;
@@ -356,19 +351,19 @@ - (void)displayDidFinish
 {
   [super displayDidFinish];
 
-  _imageLock.lock();
+  _propertyLock.lock();
     void (^displayCompletionBlock)(BOOL canceled) = _displayCompletionBlock;
     UIImage *image = _image;
-  _imageLock.unlock();
+  _propertyLock.unlock();
 
   // If we've got a block to perform after displaying, do it.
   if (image && displayCompletionBlock) {
 
     displayCompletionBlock(NO);
 
-    _imageLock.lock();
+    _propertyLock.lock();
       _displayCompletionBlock = nil;
-    _imageLock.unlock();
+    _propertyLock.unlock();
   }
 }
 
@@ -381,7 +376,7 @@ - (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))display
   }
 
   // Stash the block and call-site queue. We'll invoke it in -displayDidFinish.
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   if (_displayCompletionBlock != displayCompletionBlock) {
     _displayCompletionBlock = [displayCompletionBlock copy];
   }
@@ -393,7 +388,7 @@ - (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))display
 
 - (BOOL)isCropEnabled
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   return _cropEnabled;
 }
 
@@ -404,7 +399,7 @@ - (void)setCropEnabled:(BOOL)cropEnabled
 
 - (void)setCropEnabled:(BOOL)cropEnabled recropImmediately:(BOOL)recropImmediately inBounds:(CGRect)cropBounds
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   if (_cropEnabled == cropEnabled)
     return;
 
@@ -425,13 +420,13 @@ - (void)setCropEnabled:(BOOL)cropEnabled recropImmediately:(BOOL)recropImmediate
 
 - (CGRect)cropRect
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   return _cropRect;
 }
 
 - (void)setCropRect:(CGRect)cropRect
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   if (CGRectEqualToRect(_cropRect, cropRect))
     return;
 
@@ -452,25 +447,25 @@ - (void)setCropRect:(CGRect)cropRect
 
 - (BOOL)forceUpscaling
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   return _forceUpscaling;
 }
 
 - (void)setForceUpscaling:(BOOL)forceUpscaling
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   _forceUpscaling = forceUpscaling;
 }
 
 - (asimagenode_modification_block_t)imageModificationBlock
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   return _imageModificationBlock;
 }
 
 - (void)setImageModificationBlock:(asimagenode_modification_block_t)imageModificationBlock
 {
-  ASDN::MutexLocker l(_imageLock);
+  ASDN::MutexLocker l(_propertyLock);
   _imageModificationBlock = imageModificationBlock;
 }