Refactor serialisation of openerId & openerNavigationIndex.

ios/web/navigation/crw_session_controller.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/web/navigation/crw_session_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 19 matching lines @@
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @interface CRWSessionController () {
   // Weak pointer back to the owning NavigationManager. This is to facilitate
   // the incremental merging of the two classes.
   web::NavigationManagerImpl* _navigationManager;
 
-  NSString* _openerId;  // Id of tab who opened this tab, empty/nil if none.
-  // Navigation index of the tab which opened this tab. Do not rely on the
-  // value of this member variable to indicate whether or not this tab has
-  // an opener, as both 0 and -1 are used as navigationIndex values.
-  NSInteger _openerNavigationIndex;
   // Identifies the index of the current navigation in the CRWSessionEntry
   // array.
   NSInteger _currentNavigationIndex;
   // Identifies the index of the previous navigation in the CRWSessionEntry
   // array.
   NSInteger _previousNavigationIndex;
   // Ordered array of |CRWSessionEntry| objects, one for each site in session
   // history. End of the list is the most recent load.
   NSMutableArray* _entries;
 
@@ skipping 32 matching lines @@
 
 // TODO(rohitrao): These properties must be redefined readwrite to work around a
 // clang bug. crbug.com/228650
 @property(nonatomic, readwrite, strong) NSArray* entries;
 @property(nonatomic, readwrite, strong)
     CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager;
 
 // Expose setters for serialization properties.  These are exposed in a category
 // in SessionStorageBuilder, and will be removed as ownership of
 // their backing ivars moves to NavigationManagerImpl.
-@property(nonatomic, readwrite, copy) NSString* openerId;
 @property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM;
-@property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex;
 @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex;
 
 // Removes all entries after currentNavigationIndex_.
 - (void)clearForwardItems;
 // Discards the transient entry, if any.
 - (void)discardTransientItem;
 // Create a new autoreleased session entry.
 - (CRWSessionEntry*)sessionEntryWithURL:(const GURL&)url
                                referrer:(const web::Referrer&)referrer
                              transition:(ui::PageTransition)transition
                          initiationType:
                              (web::NavigationInitiationType)initiationType;
 // Returns YES if the PageTransition for the underlying navigationItem at
 // |index| in |entries_| has ui::PAGE_TRANSITION_IS_REDIRECT_MASK.
 - (BOOL)isRedirectTransitionForItemAtIndex:(NSInteger)index;
 // Returns a NavigationItemList containing the NavigationItems from |entries|.
 - (web::NavigationItemList)itemListForEntryList:(NSArray*)entries;
 @end
 
 @implementation CRWSessionController
 
 @synthesize currentNavigationIndex = _currentNavigationIndex;
 @synthesize previousNavigationIndex = _previousNavigationIndex;
 @synthesize pendingItemIndex = _pendingItemIndex;
 @synthesize entries = _entries;
 @synthesize windowName = _windowName;
 @synthesize lastVisitedTimestamp = _lastVisitedTimestamp;
-@synthesize openerId = _openerId;
 @synthesize openedByDOM = _openedByDOM;
-@synthesize openerNavigationIndex = _openerNavigationIndex;
 @synthesize sessionCertificatePolicyManager = _sessionCertificatePolicyManager;
 
-- (id)initWithWindowName:(NSString*)windowName
-                openerId:(NSString*)openerId
-             openedByDOM:(BOOL)openedByDOM
-   openerNavigationIndex:(NSInteger)openerIndex
-            browserState:(web::BrowserState*)browserState {
+- (instancetype)initWithWindowName:(NSString*)windowName
+                       openedByDOM:(BOOL)openedByDOM
+                      browserState:(web::BrowserState*)browserState {
   self = [super init];
   if (self) {
     self.windowName = windowName;
-    _openerId = [openerId copy];
     _openedByDOM = openedByDOM;
-    _openerNavigationIndex = openerIndex;
     _browserState = browserState;
     _entries = [NSMutableArray array];
     _lastVisitedTimestamp = [[NSDate date] timeIntervalSince1970];
     _currentNavigationIndex = -1;
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
     _sessionCertificatePolicyManager =
         [[CRWSessionCertificatePolicyManager alloc] init];
   }
   return self;
 }
 
-- (id)initWithNavigationItems:
-          (std::vector<std::unique_ptr<web::NavigationItem>>)items
-                 currentIndex:(NSUInteger)currentIndex
-                 browserState:(web::BrowserState*)browserState {
+- (instancetype)initWithNavigationItems:
+                    (std::vector<std::unique_ptr<web::NavigationItem>>)items
+                           currentIndex:(NSUInteger)currentIndex
+                           browserState:(web::BrowserState*)browserState {
   self = [super init];
   if (self) {
-    _openerId = nil;
     _browserState = browserState;
 
     // Create entries array from list of navigations.
     _entries = [[NSMutableArray alloc] initWithCapacity:items.size()];
 
     for (auto& item : items) {
       base::scoped_nsobject<CRWSessionEntry> entry(
           [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]);
       [_entries addObject:entry];
     }
     self.currentNavigationIndex = currentIndex;
     // Prior to M34, 0 was used as "no index" instead of -1; adjust for that.
     if (![_entries count])
       self.currentNavigationIndex = -1;
     if (_currentNavigationIndex >= static_cast<NSInteger>(items.size())) {
       self.currentNavigationIndex = static_cast<NSInteger>(items.size()) - 1;
     }
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
     _lastVisitedTimestamp = [[NSDate date] timeIntervalSince1970];
     _sessionCertificatePolicyManager =
         [[CRWSessionCertificatePolicyManager alloc] init];
   }
   return self;
 }
 
 - (id)copyWithZone:(NSZone*)zone {
   CRWSessionController* copy = [[[self class] alloc] init];
-  copy->_openerId = [_openerId copy];
   copy->_openedByDOM = _openedByDOM;
-  copy->_openerNavigationIndex = _openerNavigationIndex;
   copy.windowName = self.windowName;
   copy->_currentNavigationIndex = _currentNavigationIndex;
   copy->_previousNavigationIndex = _previousNavigationIndex;
   copy->_pendingItemIndex = _pendingItemIndex;
   copy->_lastVisitedTimestamp = _lastVisitedTimestamp;
   copy->_entries =
       [[NSMutableArray alloc] initWithArray:_entries copyItems:YES];
   copy->_sessionCertificatePolicyManager =
       [_sessionCertificatePolicyManager copy];
   return copy;
@@ skipping 521 matching lines @@
 }
 
 - (web::NavigationItemList)itemListForEntryList:(NSArray*)entries {
   web::NavigationItemList list(entries.count);
   for (size_t index = 0; index < entries.count; ++index)
     list[index] = [entries[index] navigationItem];
   return list;
 }
 
 @end