Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1079)

Side by Side Diff: ios/web/navigation/crw_session_controller.mm

Issue 1292143004: Perform deep copy of NavigationItems for serialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/web/navigation/crw_session_controller.h" 5 #import "ios/web/navigation/crw_session_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 copy->_propertyReleaser_CRWSessionController.Init( 268 copy->_propertyReleaser_CRWSessionController.Init(
269 copy, [CRWSessionController class]); 269 copy, [CRWSessionController class]);
270 copy->_tabId = [_tabId copy]; 270 copy->_tabId = [_tabId copy];
271 copy->_openerId = [_openerId copy]; 271 copy->_openerId = [_openerId copy];
272 copy->_openedByDOM = _openedByDOM; 272 copy->_openedByDOM = _openedByDOM;
273 copy->_openerNavigationIndex = _openerNavigationIndex; 273 copy->_openerNavigationIndex = _openerNavigationIndex;
274 copy.windowName = self.windowName; 274 copy.windowName = self.windowName;
275 copy->_currentNavigationIndex = _currentNavigationIndex; 275 copy->_currentNavigationIndex = _currentNavigationIndex;
276 copy->_previousNavigationIndex = _previousNavigationIndex; 276 copy->_previousNavigationIndex = _previousNavigationIndex;
277 copy->_lastVisitedTimestamp = _lastVisitedTimestamp; 277 copy->_lastVisitedTimestamp = _lastVisitedTimestamp;
278 copy->_entries = [_entries copy]; 278 copy->_entries =
279 [[NSMutableArray alloc] initWithArray:_entries copyItems:YES];
279 copy->_sessionCertificatePolicyManager = 280 copy->_sessionCertificatePolicyManager =
280 [_sessionCertificatePolicyManager copy]; 281 [_sessionCertificatePolicyManager copy];
281 copy->_xCallbackParameters = [_xCallbackParameters copy]; 282 copy->_xCallbackParameters = [_xCallbackParameters copy];
282 return copy; 283 return copy;
283 } 284 }
284 285
285 - (void)setCurrentNavigationIndex:(NSInteger)currentNavigationIndex { 286 - (void)setCurrentNavigationIndex:(NSInteger)currentNavigationIndex {
286 if (_currentNavigationIndex != currentNavigationIndex) { 287 if (_currentNavigationIndex != currentNavigationIndex) {
287 _currentNavigationIndex = currentNavigationIndex; 288 _currentNavigationIndex = currentNavigationIndex;
288 if (_navigationManager) 289 if (_navigationManager)
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 item->SetURL(loaded_url); 891 item->SetURL(loaded_url);
891 item->SetReferrer(referrer); 892 item->SetReferrer(referrer);
892 item->SetTransitionType(transition); 893 item->SetTransitionType(transition);
893 item->SetIsOverridingUserAgent(useDesktopUserAgent); 894 item->SetIsOverridingUserAgent(useDesktopUserAgent);
894 item->set_is_renderer_initiated(rendererInitiated); 895 item->set_is_renderer_initiated(rendererInitiated);
895 return [ 896 return [
896 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease]; 897 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease];
897 } 898 }
898 899
899 @end 900 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698