Permalink
Browse files

ScrollView: Couple of unnecessary checks was removed from RCTCustomSc…

…rollView

Summary:
* Now `setFrame:` is called by autoresizing masks, so it is safe.
* Nobody calls `setBounds:`, so it is also safe.

Reviewed By: javache

Differential Revision: D5414441

fbshipit-source-id: 6fc51c7598c4817301db51f627aa1e9840642fec
  • Loading branch information...
shergin authored and facebook-github-bot committed Jul 18, 2017
1 parent 7da5ef3 commit f5d9b5210ec9ed75fadd1a44068dfbf2e73b01a0
Showing with 0 additions and 22 deletions.
  1. +0 −22 React/Views/RCTScrollView.m
@@ -301,30 +301,8 @@ - (void)setContentOffset:(CGPoint)contentOffset
super.contentOffset = contentOffset;
}
static inline BOOL isRectInvalid(CGRect rect) {
return isnan(rect.origin.x) || isinf(rect.origin.x) ||
isnan(rect.origin.y) || isinf(rect.origin.y) ||
isnan(rect.size.width) || isinf(rect.size.width) ||
isnan(rect.size.height) || isinf(rect.size.height);
}
- (void)setBounds:(CGRect)bounds
{
if (isRectInvalid(bounds)) {
RCTLogError(@"Attempted to set an invalid bounds to inner scrollview: %@", NSStringFromCGRect(bounds));
return;
}
[super setBounds:bounds];
}
- (void)setFrame:(CGRect)frame
{
if (isRectInvalid(frame)) {
RCTLogError(@"Attempted to set an invalid frame to inner scrollview: %@", NSStringFromCGRect(frame));
return;
}
// Preserving and revalidating `contentOffset`.
CGPoint originalOffset = self.contentOffset;

0 comments on commit f5d9b52

Please sign in to comment.