rename containerWindowSize to containerSize

rcancro · rcancro · commit 7314a18ab491 · 2016-07-07T10:55:18.000-07:00
diff --git a/AsyncDisplayKit/ASViewController.mm b/AsyncDisplayKit/ASViewController.mm
@@ -197,7 +197,7 @@ - (ASEnvironmentTraitCollection)environmentTraitCollectionForUITraitCollection:(
   
   ASDisplayNodeAssertMainThread();
   ASEnvironmentTraitCollection asyncTraitCollection = ASEnvironmentTraitCollectionFromUITraitCollection(traitCollection);
-  asyncTraitCollection.containerWindowSize = self.view.frame.size;
+  asyncTraitCollection.containerSize = self.view.frame.size;
   return asyncTraitCollection;
 }
 
@@ -207,7 +207,7 @@ - (ASEnvironmentTraitCollection)environmentTraitCollectionForWindowSize:(CGSize)
     ASTraitCollection *traitCollection = self.overrideDisplayTraitsWithWindowSize(windowSize);
     return [traitCollection environmentTraitCollection];
   }
-  self.node.environmentTraitCollection.containerWindowSize = windowSize;
+  self.node.environmentTraitCollection.containerSize = windowSize;
   return self.node.environmentTraitCollection;
 }
 
@@ -233,7 +233,7 @@ - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
   [super traitCollectionDidChange:previousTraitCollection];
   
   ASEnvironmentTraitCollection environmentTraitCollection = [self environmentTraitCollectionForUITraitCollection:self.traitCollection];
-  environmentTraitCollection.containerWindowSize = self.view.bounds.size;
+  environmentTraitCollection.containerSize = self.view.bounds.size;
   [self progagateNewEnvironmentTraitCollection:environmentTraitCollection];
 }
 
diff --git a/AsyncDisplayKit/Details/ASEnvironment.h b/AsyncDisplayKit/Details/ASEnvironment.h
@@ -70,7 +70,7 @@ typedef struct ASEnvironmentTraitCollection {
   UIUserInterfaceSizeClass verticalSizeClass;
   UIForceTouchCapability forceTouchCapability;
 
-  CGSize containerWindowSize;
+  CGSize containerSize;
 } ASEnvironmentTraitCollection;
 
 extern ASEnvironmentTraitCollection ASEnvironmentTraitCollectionFromUITraitCollection(UITraitCollection *traitCollection);
diff --git a/AsyncDisplayKit/Details/ASEnvironment.mm b/AsyncDisplayKit/Details/ASEnvironment.mm
@@ -30,7 +30,7 @@ ASEnvironmentTraitCollection _ASEnvironmentTraitCollectionMakeDefault()
 {
   return (ASEnvironmentTraitCollection) {
     // Default values can be defined in here
-    .containerWindowSize = CGSizeZero,
+    .containerSize = CGSizeZero,
   };
 }
 
@@ -57,7 +57,7 @@ BOOL ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection(ASEnviron
     lhs.displayScale == rhs.displayScale &&
     lhs.userInterfaceIdiom == rhs.userInterfaceIdiom &&
     lhs.forceTouchCapability == rhs.forceTouchCapability &&
-    CGSizeEqualToSize(lhs.containerWindowSize, rhs.containerWindowSize);
+    CGSizeEqualToSize(lhs.containerSize, rhs.containerSize);
 }
 
 ASEnvironmentState ASEnvironmentStateMakeDefault()
diff --git a/AsyncDisplayKit/Details/ASTraitCollection.h b/AsyncDisplayKit/Details/ASTraitCollection.h
@@ -18,21 +18,21 @@
 @property (nonatomic, assign, readonly) UIUserInterfaceIdiom userInterfaceIdiom;
 @property (nonatomic, assign, readonly) UIUserInterfaceSizeClass verticalSizeClass;
 @property (nonatomic, assign, readonly) UIForceTouchCapability forceTouchCapability;
-@property (nonatomic, assign, readonly) CGSize containerWindowSize;
+@property (nonatomic, assign, readonly) CGSize containerSize;
 
 
 + (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits;
 
 + (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection
-                                        containerWindowSize:(CGSize)windowSize;
+                                        containerSize:(CGSize)windowSize;
 
 
 + (ASTraitCollection *)traitCollectionWithDisplayScale:(CGFloat)displayScale
                                     userInterfaceIdiom:(UIUserInterfaceIdiom)userInterfaceIdiom
                                    horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
                                      verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
                                   forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
-                                   containerWindowSize:(CGSize)windowSize;
+                                   containerSize:(CGSize)windowSize;
 
 
 - (ASEnvironmentTraitCollection)environmentTraitCollection;
diff --git a/AsyncDisplayKit/Details/ASTraitCollection.m b/AsyncDisplayKit/Details/ASTraitCollection.m
@@ -21,7 +21,7 @@ - (instancetype)initWithDisplayScale:(CGFloat)displayScale
                  horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
                    verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
                 forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
-                 containerWindowSize:(CGSize)windowSize
+                 containerSize:(CGSize)windowSize
 {
     self = [super init];
     if (self) {
@@ -30,7 +30,7 @@ - (instancetype)initWithDisplayScale:(CGFloat)displayScale
       _horizontalSizeClass = horizontalSizeClass;
       _verticalSizeClass = verticalSizeClass;
       _forceTouchCapability = forceTouchCapability;
-      _containerWindowSize = windowSize;
+      _containerSize = windowSize;
     }
     return self;
 }
@@ -40,14 +40,14 @@ + (ASTraitCollection *)traitCollectionWithDisplayScale:(CGFloat)displayScale
                                    horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
                                      verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
                                   forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
-                                   containerWindowSize:(CGSize)windowSize
+                                   containerSize:(CGSize)windowSize
 {
   return [[[self class] alloc] initWithDisplayScale:displayScale
                                  userInterfaceIdiom:userInterfaceIdiom
                                 horizontalSizeClass:horizontalSizeClass
                                   verticalSizeClass:verticalSizeClass
                                forceTouchCapability:forceTouchCapability
-                             containerWindowSize:windowSize];
+                             containerSize:windowSize];
 }
 
 + (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits
@@ -57,12 +57,12 @@ + (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnviro
                                   horizontalSizeClass:traits.horizontalSizeClass
                                     verticalSizeClass:traits.verticalSizeClass
                                  forceTouchCapability:traits.forceTouchCapability
-                            containerWindowSize:traits.containerWindowSize];
+                            containerSize:traits.containerSize];
 
 }
 
 + (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection
-                                        containerWindowSize:(CGSize)windowSize
+                                        containerSize:(CGSize)windowSize
 {
   ASTraitCollection *asyncTraitCollection = nil;
   if (AS_AT_LEAST_IOS9) {
@@ -71,15 +71,15 @@ + (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *
                                                   horizontalSizeClass:traitCollection.horizontalSizeClass
                                                     verticalSizeClass:traitCollection.verticalSizeClass
                                                  forceTouchCapability:traitCollection.forceTouchCapability
-                                                  containerWindowSize:windowSize];
+                                                  containerSize:windowSize];
   }
   else if (AS_AT_LEAST_IOS8) {
     asyncTraitCollection = [[[self class] alloc] initWithDisplayScale:traitCollection.displayScale
                                                    userInterfaceIdiom:traitCollection.userInterfaceIdiom
                                                   horizontalSizeClass:traitCollection.horizontalSizeClass
                                                     verticalSizeClass:traitCollection.verticalSizeClass
                                                  forceTouchCapability:0
-                                                  containerWindowSize:windowSize];
+                                                  containerSize:windowSize];
   } else {
     asyncTraitCollection = [[[self class] alloc] init];
   }
@@ -95,7 +95,7 @@ - (ASEnvironmentTraitCollection)environmentTraitCollection
     .userInterfaceIdiom = self.userInterfaceIdiom,
     .verticalSizeClass = self.verticalSizeClass,
     .forceTouchCapability = self.forceTouchCapability,
-    .containerWindowSize = self.containerWindowSize,
+    .containerSize = self.containerSize,
   };
 }
 
@@ -105,7 +105,7 @@ - (BOOL)isEqualToTraitCollection:(ASTraitCollection *)traitCollection
   self.horizontalSizeClass == traitCollection.horizontalSizeClass &&
   self.verticalSizeClass == traitCollection.verticalSizeClass &&
   self.userInterfaceIdiom == traitCollection.userInterfaceIdiom &&
-  CGSizeEqualToSize(self.containerWindowSize, traitCollection.containerWindowSize) &&
+  CGSizeEqualToSize(self.containerSize, traitCollection.containerSize) &&
   self.forceTouchCapability == traitCollection.forceTouchCapability;
 }
 
diff --git a/AsyncDisplayKit/Private/ASEnvironmentInternal.mm b/AsyncDisplayKit/Private/ASEnvironmentInternal.mm
@@ -207,7 +207,7 @@ ASEnvironmentState ASEnvironmentMergeObjectAndState(ASEnvironmentState childEnvi
     childTraitCollection.userInterfaceIdiom = parentTraitCollection.userInterfaceIdiom;
     childTraitCollection.forceTouchCapability = parentTraitCollection.forceTouchCapability;
     childTraitCollection.displayScale = parentTraitCollection.displayScale;
-    childTraitCollection.containerWindowSize = parentTraitCollection.containerWindowSize;
+    childTraitCollection.containerSize = parentTraitCollection.containerSize;
     childEnvironmentState.environmentTraitCollection = childTraitCollection;
 
   }

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ - (ASEnvironmentTraitCollection)environmentTraitCollectionForUITraitCollection:(`
`197`	`197`
`198`	`198`	`ASDisplayNodeAssertMainThread();`
`199`	`199`	`ASEnvironmentTraitCollection asyncTraitCollection = ASEnvironmentTraitCollectionFromUITraitCollection(traitCollection);`
`200`		`- asyncTraitCollection.containerWindowSize = self.view.frame.size;`
	`200`	`+ asyncTraitCollection.containerSize = self.view.frame.size;`
`201`	`201`	`return asyncTraitCollection;`
`202`	`202`	`}`
`203`	`203`
`@@ -207,7 +207,7 @@ - (ASEnvironmentTraitCollection)environmentTraitCollectionForWindowSize:(CGSize)`
`207`	`207`	`ASTraitCollection *traitCollection = self.overrideDisplayTraitsWithWindowSize(windowSize);`
`208`	`208`	`return [traitCollection environmentTraitCollection];`
`209`	`209`	`}`
`210`		`- self.node.environmentTraitCollection.containerWindowSize = windowSize;`
	`210`	`+ self.node.environmentTraitCollection.containerSize = windowSize;`
`211`	`211`	`return self.node.environmentTraitCollection;`
`212`	`212`	`}`
`213`	`213`
`@@ -233,7 +233,7 @@ - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection`
`233`	`233`	`[super traitCollectionDidChange:previousTraitCollection];`
`234`	`234`
`235`	`235`	`ASEnvironmentTraitCollection environmentTraitCollection = [self environmentTraitCollectionForUITraitCollection:self.traitCollection];`
`236`		`- environmentTraitCollection.containerWindowSize = self.view.bounds.size;`
	`236`	`+ environmentTraitCollection.containerSize = self.view.bounds.size;`
`237`	`237`	`[self progagateNewEnvironmentTraitCollection:environmentTraitCollection];`
`238`	`238`	`}`
`239`	`239`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ ASEnvironmentTraitCollection _ASEnvironmentTraitCollectionMakeDefault()`
`30`	`30`	`{`
`31`	`31`	`return (ASEnvironmentTraitCollection) {`
`32`	`32`	`// Default values can be defined in here`
`33`		`- .containerWindowSize = CGSizeZero,`
	`33`	`+ .containerSize = CGSizeZero,`
`34`	`34`	`};`
`35`	`35`	`}`
`36`	`36`
`@@ -57,7 +57,7 @@ BOOL ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection(ASEnviron`
`57`	`57`	`lhs.displayScale == rhs.displayScale &&`
`58`	`58`	`lhs.userInterfaceIdiom == rhs.userInterfaceIdiom &&`
`59`	`59`	`lhs.forceTouchCapability == rhs.forceTouchCapability &&`
`60`		`- CGSizeEqualToSize(lhs.containerWindowSize, rhs.containerWindowSize);`
	`60`	`+ CGSizeEqualToSize(lhs.containerSize, rhs.containerSize);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`ASEnvironmentState ASEnvironmentStateMakeDefault()`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ ASEnvironmentState ASEnvironmentMergeObjectAndState(ASEnvironmentState childEnvi`
`207`	`207`	`childTraitCollection.userInterfaceIdiom = parentTraitCollection.userInterfaceIdiom;`
`208`	`208`	`childTraitCollection.forceTouchCapability = parentTraitCollection.forceTouchCapability;`
`209`	`209`	`childTraitCollection.displayScale = parentTraitCollection.displayScale;`
`210`		`- childTraitCollection.containerWindowSize = parentTraitCollection.containerWindowSize;`
	`210`	`+ childTraitCollection.containerSize = parentTraitCollection.containerSize;`
`211`	`211`	`childEnvironmentState.environmentTraitCollection = childTraitCollection;`
`212`	`212`
`213`	`213`	`}`