From bb883bfb615cf6f36ee79eff07542d4538bfbf77 Mon Sep 17 00:00:00 2001
From: Alex Akers <a2@fb.com>
Date: Tue, 4 Aug 2015 08:17:39 -0700
Subject: [PATCH] Update offscreen image fix with window checking

Summary:
---
 Libraries/Image/RCTImageView.m | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m
index caf8dd21a7..bfee72c377 100644
--- a/Libraries/Image/RCTImageView.m
+++ b/Libraries/Image/RCTImageView.m
@@ -177,21 +177,14 @@ RCT_NOT_IMPLEMENTED(-init)
   }
 }
 
-- (void)willMoveToSuperview:(UIView *)newSuperview
+- (void)didMoveToWindow
 {
-  [super willMoveToSuperview:newSuperview];
+  [super didMoveToWindow];
 
-  if (!newSuperview) {
+  if (!self.window) {
     [self.layer removeAnimationForKey:@"contents"];
     self.image = nil;
-  }
-}
-
-- (void)didMoveToSuperview
-{
-  [super didMoveToSuperview];
-
-  if (self.superview && self.src) {
+  } else if (self.src) {
     [self reloadImage];
   }
 }