Use correct snapshot for the tab transition animation on iPad

ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.h"
 
 #include "base/ios/block_types.h"
 #include "base/ios/weak_nsobject.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 550 matching lines @@
   const CGFloat cellTopBarHeight = tabSwitcherLocalSessionCellTopBarHeight();
   CGRect finalToolbarScreenshotFrame =
       CGRectMake(0, 0, selectedCellFrame.size.width, cellTopBarHeight);
 
   base::scoped_nsobject<UIImageView> tabScreenshotImageView(
       [[UIImageView alloc] initWithFrame:CGRectZero]);
 
   base::WeakNSObject<UIImageView> weakTabScreenshotImageView(
       tabScreenshotImageView.get());
 
-  if (self.transitionContext.initialTabModel != tabModel ||
-      transitionContextContent.initialSelectedTabIndex != selectedTabIndex) {
+  if ([self initialTabModelAndTabDifferFromTabModel:tabModel
+                                             andTabID:selectedTab.tabId]) {

[marq (ping after 24h), 2017/03/30 06:17:45]

Align colons. 

+    // If we're transitioning to a different tab than the one we animated in

[marq (ping after 24h), 2017/03/30 06:17:45]

Avoid using "we" in comments; it can be ambiguous. Prefer something like "When
the tab switcher is transitioning to a different tab than the one that was
animated in from ... "

+    // from, generate a new snapshot instead of using the transition
+    // context...
     tabScreenshotImageView.get().image =
         [self updateScreenshotForCellIfNeeded:selectedCell tabModel:tabModel];
     [selectedTab retrieveSnapshot:^(UIImage* snapshot) {
       [weakTabScreenshotImageView setImage:snapshot];
     }];
   } else {
     tabScreenshotImageView.get().image =
         self.transitionContext.tabSnapshotImage;
   }
 
@@ skipping 126 matching lines @@
     tabScreenshotImageView.get().frame = finalTabScreenshotFrame;
   };
 
   [UIView animateWithDuration:animated ? kTransitionAnimationDuration : 0
                         delay:0
                       options:UIViewAnimationCurveEaseInOut
                    animations:animationBlock
                    completion:completionBlock];
 }
 
+- (BOOL)initialTabModelAndTabDifferFromTabModel:(nonnull TabModel*)tabModel
+                                         andTabID:(nonnull NSString*)tabID {

[marq (ping after 24h), 2017/03/30 06:17:45]

Align colons.

Prefer not to use 'and' to join method keywords; 'and' should only be used to
indicate a method is performing some additional action. This can just be
-initialTabModelAndTabDifferFromTabModel:tabID:

+  BOOL differ = NO;

[marq (ping after 24h), 2017/03/30 06:17:44]

'differs' ? But see below.

+  TabModel *initialTabModel = self.transitionContext.initialTabModel;

[marq (ping after 24h), 2017/03/30 06:17:44]

Chromium style is to have the pointer operator adhere to the type, so this
should be "TabModel* ".

+  NSString* initialTabID = [self transitionContextContentForTabModel:
+                     initialTabModel].initialTabID;
+  differ = initialTabModel != tabModel ||
+    [initialTabID isEqualToString:tabID] == NO;
+  return differ;

[marq (ping after 24h), 2017/03/30 06:17:45]

Instead of using the intermediate variable, it's cleaner here to just return:

return initialTabModel != tabModel || ![initialTabID isEqualToString:tabID];

[marq (ping after 24h), 2017/03/30 09:20:06]

And, (as I should have realized), we can apply De Morgan's Law to simplify this
further to:

return !(initialTabModel == tabModel && [initialTabID isEqualToString:tabID]).

At that point, I wonder if the negation should just be hoisted out of this
method, making it into

- initialTabModelAndTabMatchesTabModel:TabID:

and having the calling code check if (![self  initialTabModelAndTabMatches ...

+}
+
 - (void)updateLocalPanelsCells {
   auto mainTabPanel =
       [self panelControllerForTabModel:[_tabSwitcherModel mainTabModel]];
   auto otrTabPanel =
       [self panelControllerForTabModel:[_tabSwitcherModel otrTabModel]];
   [mainTabPanel reload];
   [otrTabPanel reload];
 }
 
 - (NSInteger)currentPanelIndex {
@@ skipping 507 matching lines @@
         base::UserMetricsAction("MobileTabSwitcherCloseNonIncognitoTab"));
   }
 }
 
 - (void)tabSwitcherPanelControllerDidUpdateOverlayViewVisibility:
     (TabSwitcherPanelController*)tabSwitcherPanelController {
   [_tabSwitcherView updateOverlayButtonState];
 }
 
 @end