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

Unified Diff: ios/chrome/browser/tabs/tab_model.mm

Issue 2809543003: [ios] Change WebStateListObserverBridge to use weak reference. (Closed)
Patch Set: Fix DCHECK in WebStateList's ObserverList destructor. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/web_state_list/web_state_list_fast_enumeration_helper.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/tabs/tab_model.mm
diff --git a/ios/chrome/browser/tabs/tab_model.mm b/ios/chrome/browser/tabs/tab_model.mm
index 66fec7ea6832d49bb8fe5f8a0de13307752c4c0e..ff6f60e652c1107baae5c1f6fd42d40126350a5b 100644
--- a/ios/chrome/browser/tabs/tab_model.mm
+++ b/ios/chrome/browser/tabs/tab_model.mm
@@ -145,6 +145,11 @@ void CleanCertificatePolicyCache(
// notification, translate and forward events, update metrics, ...).
std::vector<std::unique_ptr<WebStateListObserver>> _webStateListObservers;
+ // Strong references to id<WebStateListObserving> wrapped by non-owning
+ // WebStateListObserverBridges.
+ base::scoped_nsobject<NSArray<id<WebStateListObserving>>>
+ _retainedWebStateListObservers;
+
// The delegate for sync.
std::unique_ptr<TabModelSyncedWindowDelegate> _syncedWindowDelegate;
@@ -201,13 +206,21 @@ void CleanCertificatePolicyCache(
// Clear weak pointer to WebStateListMetricsObserver before destroying it.
_webStateListMetricsObserver = nullptr;
- [self closeAllTabs];
+ // Close all tabs. Do this in an @autoreleasepool as WebStateList observers
+ // will be notified (they are unregistered later). As some of them may be
+ // implemented in Objective-C and unregister themselves in their -dealloc
+ // method, ensure they -autorelease introduced by ARC are processed before
+ // the WebStateList destructor is called.
+ @autoreleasepool {
+ [self closeAllTabs];
+ }
// Unregister all observers after closing all the tabs as some of them are
// required to properly clean up the Tabs.
for (const auto& webStateListObserver : _webStateListObservers)
_webStateList->RemoveObserver(webStateListObserver.get());
_webStateListObservers.clear();
+ _retainedWebStateListObservers.reset();
_clearPoliciesTaskTracker.TryCancelAll();
@@ -283,12 +296,20 @@ void CleanCertificatePolicyCache(
DCHECK(service);
_sessionService.reset([service retain]);
- _webStateListObservers.push_back(base::MakeUnique<
- WebStateListObserverBridge>([
- [TabModelClosingWebStateObserver alloc]
- initWithTabModel:self
- restoreService:IOSChromeTabRestoreServiceFactory::GetForBrowserState(
- _browserState)]));
+ base::scoped_nsobject<NSMutableArray<id<WebStateListObserving>>>
+ retainedWebStateListObservers([[NSMutableArray alloc] init]);
+
+ base::scoped_nsobject<TabModelClosingWebStateObserver>
+ tabModelClosingWebStateObserver([[TabModelClosingWebStateObserver alloc]
+ initWithTabModel:self
+ restoreService:IOSChromeTabRestoreServiceFactory::
+ GetForBrowserState(_browserState)]);
+ [retainedWebStateListObservers addObject:tabModelClosingWebStateObserver];
+
+ _webStateListObservers.push_back(
+ base::MakeUnique<WebStateListObserverBridge>(
+ tabModelClosingWebStateObserver));
+
_webStateListObservers.push_back(
base::MakeUnique<SnapshotCacheWebStateListObserver>(
[SnapshotCache sharedInstance]));
@@ -298,14 +319,21 @@ void CleanCertificatePolicyCache(
_tabUsageRecorder.get()));
}
_webStateListObservers.push_back(base::MakeUnique<TabParentingObserver>());
+
+ base::scoped_nsobject<TabModelSelectedTabObserver>
+ tabModelSelectedTabObserver(
+ [[TabModelSelectedTabObserver alloc] initWithTabModel:self]);
+ [retainedWebStateListObservers addObject:tabModelSelectedTabObserver];
_webStateListObservers.push_back(
base::MakeUnique<WebStateListObserverBridge>(
- [[TabModelSelectedTabObserver alloc] initWithTabModel:self]));
+ tabModelSelectedTabObserver));
+
+ base::scoped_nsobject<TabModelObserversBridge> tabModelObserversBridge(
+ [[TabModelObserversBridge alloc] initWithTabModel:self
+ tabModelObservers:_observers.get()]);
+ [retainedWebStateListObservers addObject:tabModelObserversBridge];
_webStateListObservers.push_back(
- base::MakeUnique<WebStateListObserverBridge>(
- [[TabModelObserversBridge alloc]
- initWithTabModel:self
- tabModelObservers:_observers.get()]));
+ base::MakeUnique<WebStateListObserverBridge>(tabModelObserversBridge));
auto webStateListMetricsObserver =
base::MakeUnique<WebStateListMetricsObserver>();
@@ -314,6 +342,7 @@ void CleanCertificatePolicyCache(
for (const auto& webStateListObserver : _webStateListObservers)
_webStateList->AddObserver(webStateListObserver.get());
+ _retainedWebStateListObservers.reset([retainedWebStateListObservers copy]);
if (window) {
DCHECK([_observers empty]);
« no previous file with comments | « no previous file | ios/chrome/browser/web_state_list/web_state_list_fast_enumeration_helper.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698