Commit 9aa31419 authored by sczs's avatar sczs Committed by Commit Bot

[ios] Stops observing FeedView when its VC is removed.

Bug: 1085419
Change-Id: I3d2dee5f2241aa244cf1bdc2f5d7d8cf7005908d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2365095Reviewed-by: default avatarGanggui Tang <gogerald@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799915}
parent 78764069
...@@ -111,6 +111,7 @@ NSString* const kContentSuggestionsMostVisitedAccessibilityIdentifierPrefix = ...@@ -111,6 +111,7 @@ NSString* const kContentSuggestionsMostVisitedAccessibilityIdentifierPrefix =
} }
- (void)dealloc { - (void)dealloc {
[self.feedView removeObserver:self forKeyPath:@"contentSize"];
[self.discoverFeedVC willMoveToParentViewController:nil]; [self.discoverFeedVC willMoveToParentViewController:nil];
[self.discoverFeedVC.view removeFromSuperview]; [self.discoverFeedVC.view removeFromSuperview];
[self.discoverFeedVC removeFromParentViewController]; [self.discoverFeedVC removeFromParentViewController];
...@@ -419,8 +420,10 @@ NSString* const kContentSuggestionsMostVisitedAccessibilityIdentifierPrefix = ...@@ -419,8 +420,10 @@ NSString* const kContentSuggestionsMostVisitedAccessibilityIdentifierPrefix =
UIViewController* newFeedViewController = discoverFeedItem.discoverFeed; UIViewController* newFeedViewController = discoverFeedItem.discoverFeed;
if (newFeedViewController != self.discoverFeedVC) { if (newFeedViewController != self.discoverFeedVC) {
// If previous VC is not nil, remove it from the view hierarchy. // If previous VC is not nil, remove it from the view hierarchy and stop
// osberving its feedView.
if (self.discoverFeedVC) { if (self.discoverFeedVC) {
[self.feedView removeObserver:self forKeyPath:@"contentSize"];
[self.discoverFeedVC willMoveToParentViewController:nil]; [self.discoverFeedVC willMoveToParentViewController:nil];
[self.discoverFeedVC.view removeFromSuperview]; [self.discoverFeedVC.view removeFromSuperview];
[self.discoverFeedVC removeFromParentViewController]; [self.discoverFeedVC removeFromParentViewController];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment