Minor code improvements (#1622)

* Simplify code logic * Keep using user-defined type
TextureGroup · Aug 21, 2019 · 1467319 · 1467319
1 parent beadc28
commit 1467319
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/Source/ASExperimentalFeatures.mm b/Source/ASExperimentalFeatures.mm
@@ -41,7 +41,7 @@
 ASExperimentalFeatures ASExperimentalFeaturesFromArray(NSArray<NSString *> *array)
 {
   NSArray *allNames = ASExperimentalFeaturesGetNames(ASExperimentalFeatureAll);
-  ASExperimentalFeatures result = 0;
+  ASExperimentalFeatures result = kNilOptions;
   for (NSString *str in array) {
     NSUInteger i = [allNames indexOfObject:str];
     if (i != NSNotFound) {

diff --git a/Source/ASImageNode.mm b/Source/ASImageNode.mm
@@ -379,7 +379,7 @@ + (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESC
 
 
   // If we're not supposed to do any cropping, just decode image at original size
-  if (!cropEnabled || !contentModeSupported || stretchable) {
+  if (!cropEnabled || !contentModeSupported) {
     backingSize = imageSizeInPixels;
     imageDrawRect = (CGRect){.size = backingSize};
   } else {

diff --git a/Source/ASNetworkImageNode.mm b/Source/ASNetworkImageNode.mm
@@ -555,9 +555,7 @@ - (void)_updateProgressImageBlockOnDownloaderIfNeeded
   if (clearAndReattempt) {
     // In this case another thread changed the _downloadIdentifierForProgressBlock before we finished registering
     // the new progress block for newDownloadIDForProgressBlock ID. Let's clear it now and reattempt to register
-    if (newDownloadIDForProgressBlock) {
-      [_downloader setProgressImageBlock:nil callbackQueue:[self callbackQueue] withDownloadIdentifier:newDownloadIDForProgressBlock];
-    }
+    [_downloader setProgressImageBlock:nil callbackQueue:[self callbackQueue] withDownloadIdentifier:newDownloadIDForProgressBlock];
     [self _updateProgressImageBlockOnDownloaderIfNeeded];
   }
 }

diff --git a/Source/Debug/AsyncDisplayKit+Debug.mm b/Source/Debug/AsyncDisplayKit+Debug.mm
@@ -454,10 +454,10 @@ - (void)updateRangeController:(ASRangeController *)controller
   CGFloat leadingDisplayTuningRatio   = 0;
   CGFloat leadingPreloadTuningRatio   = 0;
 
-  if (!((displayTuningParameters.leadingBufferScreenfuls + displayTuningParameters.trailingBufferScreenfuls) == 0)) {
+  if (displayTuningParameters.leadingBufferScreenfuls + displayTuningParameters.trailingBufferScreenfuls != 0) {
     leadingDisplayTuningRatio = displayTuningParameters.leadingBufferScreenfuls / (displayTuningParameters.leadingBufferScreenfuls + displayTuningParameters.trailingBufferScreenfuls);
   }
-  if (!((preloadTuningParameters.leadingBufferScreenfuls + preloadTuningParameters.trailingBufferScreenfuls) == 0)) {
+  if (preloadTuningParameters.leadingBufferScreenfuls + preloadTuningParameters.trailingBufferScreenfuls != 0) {
     leadingPreloadTuningRatio = preloadTuningParameters.leadingBufferScreenfuls / (preloadTuningParameters.leadingBufferScreenfuls + preloadTuningParameters.trailingBufferScreenfuls);
   }
 

diff --git a/Source/Private/TextExperiment/Utility/ASTextUtilities.h b/Source/Private/TextExperiment/Utility/ASTextUtilities.h
@@ -132,7 +132,6 @@ static inline CGFloat ASTextEmojiGetDescentWithFontSize(CGFloat fontSize) {
   } else {
     return 0.3125 * fontSize;
   }
-  return 0;
 }
 
 /**

diff --git a/Source/Private/_ASPendingState.mm b/Source/Private/_ASPendingState.mm
@@ -100,7 +100,7 @@ @implementation _ASPendingState
   @package //Expose all ivars for ASDisplayNode to bypass getters for efficiency
 
   UIViewAutoresizing autoresizingMask;
-  unsigned int edgeAntialiasingMask;
+  CAEdgeAntialiasingMask edgeAntialiasingMask;
   CGRect frame;   // Frame is only to be used for synchronous views wrapped by nodes (see setFrame:)
   CGRect bounds;
   UIColor *backgroundColor;