From 3a2ca70676774ce4156f00188e37fc5bcc4a5637 Mon Sep 17 00:00:00 2001
From: Scott Goodson <scottgoodson@gmail.com>
Date: Fri, 21 Oct 2016 11:21:21 -0700
Subject: [PATCH] [ASDisplayNode] Simplify / shorten temporary bridged
 implementation of preferredFrameSize.

---
 AsyncDisplayKit/ASDisplayNode.mm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index f775504091..9b132030fc 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -3510,8 +3510,6 @@ ASEnvironmentLayoutExtensibilityForwarding
 
 - (void)setPreferredFrameSize:(CGSize)preferredFrameSize
 {
-  ASDN::MutexLocker l(__instanceLock__);
-
   // Deprecated preferredFrameSize just calls through to set width and height
   self.style.preferredSize = preferredFrameSize;
   [self invalidateCalculatedLayout];
@@ -3519,14 +3517,9 @@ ASEnvironmentLayoutExtensibilityForwarding
 
 - (CGSize)preferredFrameSize
 {
-  ASDN::MutexLocker l(__instanceLock__);
-  
-  ASLayoutElementStyle *style = self.style;
-  if (style.width.unit == ASDimensionUnitPoints && style.height.unit == ASDimensionUnitPoints) {
-    return CGSizeMake(style.width.value, style.height.value);
-  }
-
-  return CGSizeZero;
+  ASLayoutSize size = self.style.preferredLayoutSize;
+  BOOL isPoints = (size.width.unit == ASDimensionUnitPoints && size.height.unit == ASDimensionUnitPoints);
+  return isPoints ? CGSizeMake(size.width.value, size.height.value) : CGSizeZero;
 }
 
 @end