[ios] Change API to inform WebStateList of opener-opened relationship.

ios/chrome/browser/tabs/tab_model.mm

 // Copyright 2012 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/tabs/tab_model.h"
 
 #include <cstdint>
 #include <utility>
 #include <vector>
 
@@ skipping 27 matching lines @@
 #import "ios/chrome/browser/tabs/tab_model_observers_bridge.h"
 #import "ios/chrome/browser/tabs/tab_model_selected_tab_observer.h"
 #import "ios/chrome/browser/tabs/tab_model_synced_window_delegate.h"
 #import "ios/chrome/browser/tabs/tab_model_web_state_list_delegate.h"
 #import "ios/chrome/browser/tabs/tab_parenting_observer.h"
 #import "ios/chrome/browser/xcallback_parameters.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list_fast_enumeration_helper.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list_metrics_observer.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list_observer.h"
+#import "ios/shared/chrome/browser/tabs/web_state_opener.h"
 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/certificate_policy_cache.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/web_thread.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/web_state_impl.h"
 #include "url/gurl.h"
@@ skipping 380 matching lines @@
 
   DCHECK_GE(index, 0);
   return [self tabAtIndex:static_cast<NSUInteger>(index)];
 }
 
 - (Tab*)openerOfTab:(Tab*)tab {
   int index = _webStateList->GetIndexOfWebState(tab.webState);
   if (index == WebStateList::kInvalidIndex)
     return nil;
 
-  web::WebState* opener = _webStateList->GetOpenerOfWebStateAt(index);
-  return opener ? LegacyTabHelper::GetTabForWebState(opener) : nil;
+  WebStateOpener opener = _webStateList->GetOpenerOfWebStateAt(index);
+  return opener.opener ? LegacyTabHelper::GetTabForWebState(opener.opener)
+                       : nil;
 }
 
 - (Tab*)insertTabWithURL:(const GURL&)URL
                 referrer:(const web::Referrer&)referrer
               transition:(ui::PageTransition)transition
                   opener:(Tab*)parentTab
              openedByDOM:(BOOL)openedByDOM
                  atIndex:(NSUInteger)index
             inBackground:(BOOL)inBackground {
   web::NavigationManager::WebLoadParams params(URL);
@@ skipping 59 matching lines @@
 
 - (void)insertTab:(Tab*)tab
           atIndex:(NSUInteger)index
            opener:(Tab*)parentTab
        transition:(ui::PageTransition)transition {
   DCHECK(tab);
   DCHECK(![_tabRetainer containsObject:tab]);
 
   [_tabRetainer addObject:tab];
   if (index == TabModelConstants::kTabPositionAutomatically) {
-    _webStateList->AppendWebState(transition, tab.webState, parentTab.webState);
+    _webStateList->AppendWebState(
+        transition, tab.webState,
+        WebStateOpener(parentTab.webState, tab.openerNavigationIndex));
   } else {
     DCHECK_LE(index, static_cast<NSUInteger>(INT_MAX));
     const int insertion_index = static_cast<int>(index);
-    _webStateList->InsertWebState(insertion_index, tab.webState,
-                                  parentTab.webState);
+    _webStateList->InsertWebState(insertion_index, tab.webState);
+    if (parentTab.webState) {
+      _webStateList->SetOpenerOfWebStateAt(
+          insertion_index,
+          WebStateOpener(parentTab.webState, tab.openerNavigationIndex));
+    }
   }
 
   // Persist the session due to a new tab being inserted. If this is a
   // background tab (will not become active), saving now will capture the
   // state properly. If it does eventually become active, another save will
   // be triggered to properly capture the end result.
   [self saveSessionImmediately:NO];
 }
 
 - (void)insertTab:(Tab*)tab atIndex:(NSUInteger)index opener:(Tab*)parentTab {
@@ skipping 34 matching lines @@
   [_tabRetainer removeObject:oldTab];
   [_tabRetainer addObject:newTab];
   [newTab setParentTabModel:self];
 
   // The WebState is owned by the associated Tab, so it is safe to ignore
   // the result and won't cause a memory leak. Once the ownership is moved
   // to WebStateList, this function will return a std::unique_ptr<> and the
   // object destroyed as expected, so it will fine to ignore the result then
   // too. See http://crbug.com/546222 for progress of changing the ownership
   // of the WebStates.
-  ignore_result(_webStateList->ReplaceWebStateAt(
-      index, newTab.webState, GetOpenerForTab(self, newTab).webState));
+  ignore_result(_webStateList->ReplaceWebStateAt(index, newTab.webState));
+
+  Tab* parentTab = GetOpenerForTab(self, newTab);
+  if (parentTab) {
+    _webStateList->SetOpenerOfWebStateAt(
+        index,
+        WebStateOpener(parentTab.webState, newTab.openerNavigationIndex));
+  }
 
   [oldTab setParentTabModel:nil];
   [oldTab close];
 }
 
 - (void)closeTabAtIndex:(NSUInteger)index {
   DCHECK(index < self.count);
   [self closeTab:[self tabAtIndex:index]];
 }
 
@@ skipping 276 matching lines @@
 
   // Fix openers now that all Tabs have been restored. Only look for an opener
   // Tab in the newly restored Tabs and not in the already open Tabs.
   for (int index = oldCount; index < _webStateList->count(); ++index) {
     DCHECK_GE(index, oldCount);
     NSUInteger tabIndex = static_cast<NSUInteger>(index - oldCount);
     Tab* tab = [restoredTabs objectAtIndex:tabIndex];
     Tab* opener = GetOpenerForTab(restoredTabs.get(), tab);
     if (opener) {
       DCHECK(opener.webState);
-      _webStateList->SetOpenerOfWebStateAt(index, opener.webState);
+      _webStateList->SetOpenerOfWebStateAt(
+          index, WebStateOpener(opener.webState, tab.openerNavigationIndex));
     }
   }
 
   // Update the selected tab if there was a selected Tab in the saved session.
   if (window.selectedIndex != NSNotFound) {
     NSUInteger selectedIndex = window.selectedIndex + oldCount;
     DCHECK_LT(selectedIndex, self.count);
     DCHECK([self tabAtIndex:selectedIndex]);
 
     if (persistState && self.currentTab)
@@ skipping 61 matching lines @@
 }
 
 // Called when UIApplicationWillEnterForegroundNotification is received.
 - (void)applicationWillEnterForeground:(NSNotification*)notify {
   if (_tabUsageRecorder) {
     _tabUsageRecorder->AppWillEnterForeground();
   }
 }
 
 @end