Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/chrome/browser/tabs/tab.h" | 5 #import "ios/chrome/browser/tabs/tab.h" |
| 6 | 6 |
| 7 #import <CoreLocation/CoreLocation.h> | 7 #import <CoreLocation/CoreLocation.h> |
| 8 #import <UIKit/UIKit.h> | 8 #import <UIKit/UIKit.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 | 163 |
| 164 namespace { | 164 namespace { |
| 165 class TabHistoryContext; | 165 class TabHistoryContext; |
| 166 class FaviconDriverObserverBridge; | 166 class FaviconDriverObserverBridge; |
| 167 class TabInfoBarObserver; | 167 class TabInfoBarObserver; |
| 168 | 168 |
| 169 // The key under which the Tab ID is stored in the WebState's serializable user | 169 // The key under which the Tab ID is stored in the WebState's serializable user |
| 170 // data. | 170 // data. |
| 171 NSString* const kTabIDKey = @"TabID"; | 171 NSString* const kTabIDKey = @"TabID"; |
| 172 | 172 |
| 173 // The key under which the opener Tab ID is stored in the WebState's | |
| 174 // serializable user data. | |
| 175 NSString* const kOpenerIDKey = @"OpenerID"; | |
| 176 | |
| 177 // The key under which the opener navigation index is stored in the WebState's | |
| 178 // serializable user data. | |
| 179 NSString* const kOpenerNavigationIndexKey = @"OpenerNavigationIndex"; | |
| 180 | |
| 181 // Name of histogram for recording the state of the tab when the renderer is | 173 // Name of histogram for recording the state of the tab when the renderer is |
| 182 // terminated. | 174 // terminated. |
| 183 const char kRendererTerminationStateHistogram[] = | 175 const char kRendererTerminationStateHistogram[] = |
| 184 "Tab.StateAtRendererTermination"; | 176 "Tab.StateAtRendererTermination"; |
| 185 | 177 |
| 186 // Referrer used for clicks on article suggestions on the NTP. | 178 // Referrer used for clicks on article suggestions on the NTP. |
| 187 const char kChromeContentSuggestionsReferrer[] = | 179 const char kChromeContentSuggestionsReferrer[] = |
| 188 "https://www.googleapis.com/auth/chrome-content-suggestions"; | 180 "https://www.googleapis.com/auth/chrome-content-suggestions"; |
| 189 | 181 |
| 190 // Enum corresponding to UMA's TabForegroundState, for | 182 // Enum corresponding to UMA's TabForegroundState, for |
| 191 // Tab.StateAtRendererTermination. Must be kept in sync with the UMA enum. | 183 // Tab.StateAtRendererTermination. Must be kept in sync with the UMA enum. |
| 192 enum class RendererTerminationTabState { | 184 enum class RendererTerminationTabState { |
| 193 // These two values are for when the app is in the foreground. | 185 // These two values are for when the app is in the foreground. |
| 194 FOREGROUND_TAB_FOREGROUND_APP = 0, | 186 FOREGROUND_TAB_FOREGROUND_APP = 0, |
| 195 BACKGROUND_TAB_FOREGROUND_APP, | 187 BACKGROUND_TAB_FOREGROUND_APP, |
| 196 // These are for when the app is in the background. | 188 // These are for when the app is in the background. |
| 197 FOREGROUND_TAB_BACKGROUND_APP, | 189 FOREGROUND_TAB_BACKGROUND_APP, |
| 198 BACKGROUND_TAB_BACKGROUND_APP, | 190 BACKGROUND_TAB_BACKGROUND_APP, |
| 199 TERMINATION_TAB_STATE_COUNT | 191 TERMINATION_TAB_STATE_COUNT |
| 200 }; | 192 }; |
| 201 } // namespace | 193 } // namespace |
| 202 | 194 |
| 203 @interface Tab ()<CRWWebStateObserver, | 195 @interface Tab ()<CRWWebStateObserver, |
| 196 CRWWebControllerObserver, | |
| 204 FindInPageControllerDelegate, | 197 FindInPageControllerDelegate, |
| 205 ReaderModeControllerDelegate> { | 198 ReaderModeControllerDelegate> { |
| 206 TabModel* parentTabModel_; // weak | 199 TabModel* parentTabModel_; // weak |
| 207 ios::ChromeBrowserState* browserState_; // weak | 200 ios::ChromeBrowserState* browserState_; // weak |
| 208 | 201 |
| 209 base::scoped_nsobject<OpenInController> openInController_; | 202 base::scoped_nsobject<OpenInController> openInController_; |
| 210 base::WeakNSProtocol<id<PassKitDialogProvider>> passKitDialogProvider_; | 203 base::WeakNSProtocol<id<PassKitDialogProvider>> passKitDialogProvider_; |
| 211 | 204 |
| 212 // Whether or not this tab is currently being displayed. | 205 // Whether or not this tab is currently being displayed. |
| 213 BOOL visible_; | 206 BOOL visible_; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 288 base::scoped_nsobject<WebControllerSnapshotHelper> | 281 base::scoped_nsobject<WebControllerSnapshotHelper> |
| 289 webControllerSnapshotHelper_; | 282 webControllerSnapshotHelper_; |
| 290 | 283 |
| 291 // Handles support for window.print JavaScript calls. | 284 // Handles support for window.print JavaScript calls. |
| 292 std::unique_ptr<PrintObserver> printObserver_; | 285 std::unique_ptr<PrintObserver> printObserver_; |
| 293 | 286 |
| 294 // AutoReloadBridge for this tab. | 287 // AutoReloadBridge for this tab. |
| 295 base::scoped_nsobject<AutoReloadBridge> autoReloadBridge_; | 288 base::scoped_nsobject<AutoReloadBridge> autoReloadBridge_; |
| 296 | 289 |
| 297 // WebStateImpl for this tab. | 290 // WebStateImpl for this tab. |
| 298 std::unique_ptr<web::WebStateImpl> webStateImpl_; | 291 web::WebStateImpl* webStateImpl_; |
| 299 | 292 |
| 300 // Allows Tab to conform CRWWebStateDelegate protocol. | 293 // Allows Tab to conform CRWWebStateDelegate protocol. |
| 301 std::unique_ptr<web::WebStateObserverBridge> webStateObserver_; | 294 std::unique_ptr<web::WebStateObserverBridge> webStateObserver_; |
| 302 | 295 |
| 303 // Context used by history to scope the lifetime of navigation entry | 296 // Context used by history to scope the lifetime of navigation entry |
| 304 // references to Tab. | 297 // references to Tab. |
| 305 std::unique_ptr<TabHistoryContext> tabHistoryContext_; | 298 std::unique_ptr<TabHistoryContext> tabHistoryContext_; |
| 306 | 299 |
| 307 // The controller for everything related to reader mode. | 300 // The controller for everything related to reader mode. |
| 308 base::scoped_nsobject<ReaderModeController> readerModeController_; | 301 base::scoped_nsobject<ReaderModeController> readerModeController_; |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 471 | 464 |
| 472 @synthesize browserState = browserState_; | 465 @synthesize browserState = browserState_; |
| 473 @synthesize useGreyImageCache = useGreyImageCache_; | 466 @synthesize useGreyImageCache = useGreyImageCache_; |
| 474 @synthesize isPrerenderTab = isPrerenderTab_; | 467 @synthesize isPrerenderTab = isPrerenderTab_; |
| 475 @synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_; | 468 @synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_; |
| 476 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_; | 469 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_; |
| 477 @synthesize delegate = delegate_; | 470 @synthesize delegate = delegate_; |
| 478 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; | 471 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; |
| 479 @synthesize tabHeadersDelegate = tabHeadersDelegate_; | 472 @synthesize tabHeadersDelegate = tabHeadersDelegate_; |
| 480 | 473 |
| 481 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState | 474 - (instancetype)initWithWebState:(web::WebState*)webState { |
| 482 opener:(Tab*)opener | |
| 483 openedByDOM:(BOOL)openedByDOM | |
| 484 model:(TabModel*)parentModel { | |
| 485 web::WebState::CreateParams params(browserState); | |
| 486 params.created_with_opener = openedByDOM; | |
| 487 std::unique_ptr<web::WebState> webState = web::WebState::Create(params); | |
| 488 if ([opener navigationManager]) { | |
| 489 web::SerializableUserDataManager* userDataManager = | |
| 490 web::SerializableUserDataManager::FromWebState(webState.get()); | |
| 491 userDataManager->AddSerializableData(opener.tabId, kOpenerIDKey); | |
| 492 userDataManager->AddSerializableData( | |
| 493 @([opener navigationManager]->GetLastCommittedItemIndex()), | |
| 494 kOpenerNavigationIndexKey); | |
| 495 } | |
| 496 | |
| 497 return [self initWithWebState:std::move(webState) model:parentModel]; | |
| 498 } | |
| 499 | |
| 500 - (instancetype)initWithWebState:(std::unique_ptr<web::WebState>)webState | |
| 501 model:(TabModel*)parentModel { | |
| 502 return [self initWithWebState:std::move(webState) | |
| 503 model:parentModel | |
| 504 attachTabHelpers:YES]; | |
| 505 } | |
| 506 | |
| 507 - (instancetype)initWithWebState:(std::unique_ptr<web::WebState>)webState | |
| 508 model:(TabModel*)parentModel | |
| 509 attachTabHelpers:(BOOL)attachTabHelpers { | |
| 510 DCHECK(webState); | 475 DCHECK(webState); |
| 511 self = [super init]; | 476 self = [super init]; |
| 512 if (self) { | 477 if (self) { |
| 513 propertyReleaser_Tab_.Init(self, [Tab class]); | 478 propertyReleaser_Tab_.Init(self, [Tab class]); |
| 514 tabHistoryContext_.reset(new TabHistoryContext()); | 479 |
| 515 parentTabModel_ = parentModel; | 480 // TODO(crbug.com/620465): Tab should only use public API of WebState. |
| 481 // Remove this cast once this is the case. | |
| 482 webStateImpl_ = static_cast<web::WebStateImpl*>(webState); | |
| 516 browserState_ = | 483 browserState_ = |
| 517 ios::ChromeBrowserState::FromBrowserState(webState->GetBrowserState()); | 484 ios::ChromeBrowserState::FromBrowserState(webState->GetBrowserState()); |
| 518 | 485 |
| 519 webStateImpl_.reset(static_cast<web::WebStateImpl*>(webState.release())); | 486 tabHistoryContext_ = base::MakeUnique<TabHistoryContext>(); |
| 520 webStateObserver_.reset( | 487 webStateObserver_ = |
| 521 new web::WebStateObserverBridge(self.webState, self)); | 488 base::MakeUnique<web::WebStateObserverBridge>(webState, self); |
| 489 | |
| 522 [self updateLastVisitedTimestamp]; | 490 [self updateLastVisitedTimestamp]; |
| 523 | 491 [[self webController] addObserver:self]; |
| 524 // Do not respect |attachTabHelpers| as this tab helper is required for | 492 [[self webController] setDelegate:self]; |
| 525 // proper conversion from WebState to Tab. | |
| 526 LegacyTabHelper::CreateForWebState(self.webState, self); | |
| 527 | |
| 528 [self.webController setDelegate:self]; | |
| 529 | 493 |
| 530 snapshotManager_.reset([[SnapshotManager alloc] init]); | 494 snapshotManager_.reset([[SnapshotManager alloc] init]); |
| 531 webControllerSnapshotHelper_.reset([[WebControllerSnapshotHelper alloc] | 495 webControllerSnapshotHelper_.reset([[WebControllerSnapshotHelper alloc] |
| 532 initWithSnapshotManager:snapshotManager_ | 496 initWithSnapshotManager:snapshotManager_ |
| 533 tab:self]); | 497 tab:self]); |
| 534 | 498 |
| 535 [self initNativeAppNavigationController]; | 499 [self initNativeAppNavigationController]; |
| 536 | 500 |
| 537 if (attachTabHelpers) { | |
| 538 AttachTabHelpers(self.webState); | |
| 539 | |
| 540 tabInfoBarObserver_.reset(new TabInfoBarObserver(self)); | |
| 541 tabInfoBarObserver_->SetShouldObserveInfoBarManager(true); | |
| 542 | |
| 543 if (experimental_flags::IsAutoReloadEnabled()) { | |
| 544 autoReloadBridge_.reset([[AutoReloadBridge alloc] initWithTab:self]); | |
| 545 } | |
| 546 printObserver_.reset(new PrintObserver(self.webState)); | |
| 547 | |
| 548 base::scoped_nsprotocol<id<PasswordsUiDelegate>> passwordsUiDelegate( | |
| 549 [[PasswordsUiDelegateImpl alloc] init]); | |
| 550 passwordController_.reset([[PasswordController alloc] | |
| 551 initWithWebState:self.webState | |
| 552 passwordsUiDelegate:passwordsUiDelegate]); | |
| 553 password_manager::PasswordGenerationManager* passwordGenerationManager = | |
| 554 [passwordController_ passwordGenerationManager]; | |
| 555 autofillController_.reset([[AutofillController alloc] | |
| 556 initWithBrowserState:browserState_ | |
| 557 passwordGenerationManager:passwordGenerationManager | |
| 558 webState:self.webState]); | |
| 559 suggestionController_.reset([[FormSuggestionController alloc] | |
| 560 initWithWebState:self.webState | |
| 561 providers:[self suggestionProviders]]); | |
| 562 inputAccessoryViewController_.reset( | |
| 563 [[FormInputAccessoryViewController alloc] | |
| 564 initWithWebState:self.webState | |
| 565 providers:[self accessoryViewProviders]]); | |
| 566 | |
| 567 [self setShouldObserveFaviconChanges:YES]; | |
| 568 | |
| 569 if (parentModel && parentModel.syncedWindowDelegate) { | |
| 570 IOSChromeSessionTabHelper::FromWebState(self.webState) | |
| 571 ->SetWindowID(parentModel.sessionID); | |
| 572 } | |
| 573 | |
| 574 // Create the ReaderModeController immediately so it can register for | |
| 575 // WebState changes. | |
| 576 if (experimental_flags::IsReaderModeEnabled()) { | |
| 577 readerModeController_.reset([[ReaderModeController alloc] | |
| 578 initWithWebState:self.webState | |
| 579 delegate:self]); | |
| 580 } | |
| 581 } | |
| 582 | |
| 583 [[NSNotificationCenter defaultCenter] | 501 [[NSNotificationCenter defaultCenter] |
| 584 addObserver:self | 502 addObserver:self |
| 585 selector:@selector(applicationDidBecomeActive) | 503 selector:@selector(applicationDidBecomeActive) |
| 586 name:UIApplicationDidBecomeActiveNotification | 504 name:UIApplicationDidBecomeActiveNotification |
| 587 object:nil]; | 505 object:nil]; |
| 588 } | 506 } |
| 589 return self; | 507 return self; |
| 590 } | 508 } |
| 591 | 509 |
| 510 - (void)attachTabHelpers { | |
| 511 tabInfoBarObserver_.reset(new TabInfoBarObserver(self)); | |
| 512 tabInfoBarObserver_->SetShouldObserveInfoBarManager(true); | |
| 513 | |
| 514 if (experimental_flags::IsAutoReloadEnabled()) { | |
| 515 autoReloadBridge_.reset([[AutoReloadBridge alloc] initWithTab:self]); | |
| 516 } | |
| 517 printObserver_ = base::MakeUnique<PrintObserver>(self.webState); | |
| 518 | |
| 519 base::scoped_nsprotocol<id<PasswordsUiDelegate>> passwordsUiDelegate( | |
| 520 [[PasswordsUiDelegateImpl alloc] init]); | |
| 521 passwordController_.reset([[PasswordController alloc] | |
| 522 initWithWebState:self.webState | |
| 523 passwordsUiDelegate:passwordsUiDelegate]); | |
| 524 password_manager::PasswordGenerationManager* passwordGenerationManager = | |
| 525 [passwordController_ passwordGenerationManager]; | |
| 526 autofillController_.reset([[AutofillController alloc] | |
| 527 initWithBrowserState:browserState_ | |
| 528 passwordGenerationManager:passwordGenerationManager | |
| 529 webState:self.webState]); | |
| 530 suggestionController_.reset([[FormSuggestionController alloc] | |
| 531 initWithWebState:self.webState | |
| 532 providers:[self suggestionProviders]]); | |
| 533 inputAccessoryViewController_.reset([[FormInputAccessoryViewController alloc] | |
| 534 initWithWebState:self.webState | |
| 535 providers:[self accessoryViewProviders]]); | |
| 536 | |
| 537 [self setShouldObserveFaviconChanges:YES]; | |
| 538 | |
| 539 // Create the ReaderModeController immediately so it can register for | |
| 540 // WebState changes. | |
| 541 if (experimental_flags::IsReaderModeEnabled()) { | |
| 542 readerModeController_.reset([[ReaderModeController alloc] | |
| 543 initWithWebState:self.webState | |
| 544 delegate:self]); | |
| 545 } | |
| 546 } | |
| 547 | |
| 592 - (NSArray*)accessoryViewProviders { | 548 - (NSArray*)accessoryViewProviders { |
| 593 NSMutableArray* providers = [NSMutableArray array]; | 549 NSMutableArray* providers = [NSMutableArray array]; |
| 594 id<FormInputAccessoryViewProvider> provider = | 550 id<FormInputAccessoryViewProvider> provider = |
| 595 [passwordController_ accessoryViewProvider]; | 551 [passwordController_ accessoryViewProvider]; |
| 596 if (provider) | 552 if (provider) |
| 597 [providers addObject:provider]; | 553 [providers addObject:provider]; |
| 598 [providers addObject:[suggestionController_ accessoryViewProvider]]; | 554 [providers addObject:[suggestionController_ accessoryViewProvider]]; |
| 599 return providers; | 555 return providers; |
| 600 } | 556 } |
| 601 | 557 |
| 602 - (NSArray*)suggestionProviders { | 558 - (NSArray*)suggestionProviders { |
| 603 NSMutableArray* providers = [NSMutableArray array]; | 559 NSMutableArray* providers = [NSMutableArray array]; |
| 604 [providers addObject:[passwordController_ suggestionProvider]]; | 560 [providers addObject:[passwordController_ suggestionProvider]]; |
| 605 [providers addObject:[autofillController_ suggestionProvider]]; | 561 [providers addObject:[autofillController_ suggestionProvider]]; |
| 606 return providers; | 562 return providers; |
| 607 } | 563 } |
| 608 | 564 |
| 609 - (id<FindInPageControllerDelegate>)findInPageControllerDelegate { | 565 - (id<FindInPageControllerDelegate>)findInPageControllerDelegate { |
| 610 return self; | 566 return self; |
| 611 } | 567 } |
| 612 | 568 |
| 613 + (Tab*)preloadingTabWithBrowserState:(ios::ChromeBrowserState*)browserState | |
| 614 url:(const GURL&)URL | |
| 615 referrer:(const web::Referrer&)referrer | |
| 616 transition:(ui::PageTransition)transition | |
| 617 provider:(id<CRWNativeContentProvider>)provider | |
| 618 opener:(Tab*)opener | |
| 619 desktopUserAgent:(BOOL)desktopUserAgent | |
| 620 configuration:(void (^)(Tab*))configuration { | |
| 621 Tab* tab = [[[Tab alloc] initWithBrowserState:browserState | |
| 622 opener:opener | |
| 623 openedByDOM:NO | |
| 624 model:nil] autorelease]; | |
| 625 if (desktopUserAgent) | |
| 626 [tab enableDesktopUserAgent]; | |
| 627 [[tab webController] setNativeProvider:provider]; | |
| 628 [[tab webController] setWebUsageEnabled:YES]; | |
| 629 | |
| 630 if (configuration) | |
| 631 configuration(tab); | |
| 632 | |
| 633 web::NavigationManager::WebLoadParams params(URL); | |
| 634 params.transition_type = transition; | |
| 635 params.referrer = referrer; | |
| 636 [[tab webController] loadWithParams:params]; | |
| 637 | |
| 638 return tab; | |
| 639 } | |
| 640 | |
| 641 - (void)dealloc { | |
| 642 DCHECK([NSThread isMainThread]); | |
| 643 // Note that -[CRWWebController close] has already been called, so nothing | |
| 644 // significant should be done with it in this method. | |
| 645 DCHECK_NE(self.webController.delegate, self); | |
| 646 [super dealloc]; | |
| 647 } | |
| 648 | 569 |
| 649 - (void)setParentTabModel:(TabModel*)model { | 570 - (void)setParentTabModel:(TabModel*)model { |
| 650 DCHECK(!model || !parentTabModel_); | 571 DCHECK(!model || !parentTabModel_); |
| 651 parentTabModel_ = model; | 572 parentTabModel_ = model; |
| 652 | 573 |
| 653 if (parentTabModel_.syncedWindowDelegate) { | 574 if (parentTabModel_.syncedWindowDelegate) { |
| 654 IOSChromeSessionTabHelper::FromWebState(self.webState) | 575 IOSChromeSessionTabHelper::FromWebState(self.webState) |
| 655 ->SetWindowID(model.sessionID); | 576 ->SetWindowID(model.sessionID); |
| 656 } | 577 } |
| 657 } | 578 } |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 740 | 661 |
| 741 if (!tabId || ![tabId length]) { | 662 if (!tabId || ![tabId length]) { |
| 742 tabId = [[NSUUID UUID] UUIDString]; | 663 tabId = [[NSUUID UUID] UUIDString]; |
| 743 userDataManager->AddSerializableData(tabId, kTabIDKey); | 664 userDataManager->AddSerializableData(tabId, kTabIDKey); |
| 744 } | 665 } |
| 745 | 666 |
| 746 tabId_.reset([tabId copy]); | 667 tabId_.reset([tabId copy]); |
| 747 return tabId_.get(); | 668 return tabId_.get(); |
| 748 } | 669 } |
| 749 | 670 |
| 750 - (NSString*)openerID { | |
| 751 DCHECK(self.webState); | |
| 752 web::SerializableUserDataManager* userDataManager = | |
| 753 web::SerializableUserDataManager::FromWebState(self.webState); | |
| 754 id<NSCoding> openerID = | |
| 755 userDataManager->GetValueForSerializationKey(kOpenerIDKey); | |
| 756 return base::mac::ObjCCastStrict<NSString>(openerID); | |
| 757 } | |
| 758 | |
| 759 - (NSInteger)openerNavigationIndex { | |
| 760 DCHECK(self.webState); | |
| 761 web::SerializableUserDataManager* userDataManager = | |
| 762 web::SerializableUserDataManager::FromWebState(self.webState); | |
| 763 id<NSCoding> openerNavigationIndex = | |
| 764 userDataManager->GetValueForSerializationKey(kOpenerNavigationIndexKey); | |
| 765 if (!openerNavigationIndex) | |
| 766 return -1; | |
| 767 return base::mac::ObjCCastStrict<NSNumber>(openerNavigationIndex) | |
| 768 .integerValue; | |
| 769 } | |
| 770 | |
| 771 - (web::WebState*)webState { | 671 - (web::WebState*)webState { |
| 772 return webStateImpl_.get(); | 672 return webStateImpl_; |
| 773 } | 673 } |
| 774 | 674 |
| 775 - (void)fetchFavicon { | 675 - (void)fetchFavicon { |
| 776 const GURL& url = self.url; | 676 const GURL& url = self.url; |
| 777 if (!url.is_valid()) | 677 if (!url.is_valid()) |
| 778 return; | 678 return; |
| 779 | 679 |
| 780 favicon::FaviconDriver* faviconDriver = | 680 favicon::FaviconDriver* faviconDriver = |
| 781 favicon::WebFaviconDriver::FromWebState(self.webState); | 681 favicon::WebFaviconDriver::FromWebState(self.webState); |
| 782 if (faviconDriver) { | 682 if (faviconDriver) { |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1129 // Equivalent to the user pressing 'stop', or a window.stop() command. | 1029 // Equivalent to the user pressing 'stop', or a window.stop() command. |
| 1130 - (void)stopLoading { | 1030 - (void)stopLoading { |
| 1131 [self.webController stopLoading]; | 1031 [self.webController stopLoading]; |
| 1132 } | 1032 } |
| 1133 | 1033 |
| 1134 // Halt the tab, which amounts to halting its webController. | 1034 // Halt the tab, which amounts to halting its webController. |
| 1135 - (void)terminateNetworkActivity { | 1035 - (void)terminateNetworkActivity { |
| 1136 [self.webController terminateNetworkActivity]; | 1036 [self.webController terminateNetworkActivity]; |
| 1137 } | 1037 } |
| 1138 | 1038 |
| 1139 // This can't be done in dealloc in case someone holds an extra strong | 1039 - (void)webStateDestroyed:(web::WebState*)webState { |
| 1140 // reference to the Tab, which would cause the close sequence to fire at a | 1040 DCHECK_EQ(webStateImpl_, webState); |
| 1141 // random time. | |
| 1142 - (void)close { | |
| 1143 self.fullScreenControllerDelegate = nil; | 1041 self.fullScreenControllerDelegate = nil; |
| 1144 self.overscrollActionsControllerDelegate = nil; | 1042 self.overscrollActionsControllerDelegate = nil; |
| 1145 self.passKitDialogProvider = nil; | 1043 self.passKitDialogProvider = nil; |
| 1146 self.snapshotOverlayProvider = nil; | 1044 self.snapshotOverlayProvider = nil; |
| 1147 | 1045 |
| 1148 [[NSNotificationCenter defaultCenter] removeObserver:self]; | 1046 [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| 1149 | 1047 |
| 1150 [passwordController_ detach]; | 1048 [passwordController_ detach]; |
| 1151 passwordController_.reset(); | 1049 passwordController_.reset(); |
| 1152 tabInfoBarObserver_.reset(); | 1050 tabInfoBarObserver_.reset(); |
| 1153 | 1051 |
| 1154 faviconDriverObserverBridge_.reset(); | 1052 faviconDriverObserverBridge_.reset(); |
| 1155 [openInController_ detachFromWebController]; | 1053 [openInController_ detachFromWebController]; |
| 1156 openInController_.reset(); | 1054 openInController_.reset(); |
| 1157 [autofillController_ detachFromWebState]; | 1055 [autofillController_ detachFromWebState]; |
| 1158 [suggestionController_ detachFromWebState]; | 1056 [suggestionController_ detachFromWebState]; |
| 1159 if (fullScreenController_) | 1057 if (fullScreenController_) |
| 1160 [self.webController removeObserver:fullScreenController_]; | 1058 [self.webController removeObserver:fullScreenController_]; |
|
rohitrao (ping after 24h)
2017/04/03 17:49:34
Over IM, you mentioned that Tab is now a WebContro
sdefresne
2017/04/04 13:47:56
On IM I said that Tab need to be a WebControllerOb
| |
| 1161 [fullScreenController_ invalidate]; | 1059 [fullScreenController_ invalidate]; |
| 1162 fullScreenController_.reset(); | 1060 fullScreenController_.reset(); |
| 1163 if (overscrollActionsController_) | 1061 if (overscrollActionsController_) |
| 1164 [self.webController removeObserver:overscrollActionsController_]; | 1062 [self.webController removeObserver:overscrollActionsController_]; |
| 1165 [overscrollActionsController_ invalidate]; | 1063 [overscrollActionsController_ invalidate]; |
| 1166 overscrollActionsController_.reset(); | 1064 overscrollActionsController_.reset(); |
| 1167 [readerModeController_ detachFromWebState]; | 1065 [readerModeController_ detachFromWebState]; |
| 1168 readerModeController_.reset(); | 1066 readerModeController_.reset(); |
| 1169 | 1067 |
| 1170 // Invalidate any snapshot stored for this session. | 1068 // Invalidate any snapshot stored for this session. |
| 1171 DCHECK(self.tabId); | 1069 DCHECK(self.tabId); |
| 1172 [snapshotManager_ removeImageWithSessionID:self.tabId]; | 1070 [snapshotManager_ removeImageWithSessionID:self.tabId]; |
| 1173 // Reset association with the webController. | |
| 1174 [self.webController setDelegate:nil]; | |
| 1175 | 1071 |
| 1176 // Cancel any queued dialogs. | 1072 // Cancel any queued dialogs. |
| 1177 [self.dialogDelegate cancelDialogForTab:self]; | 1073 [self.dialogDelegate cancelDialogForTab:self]; |
| 1178 | 1074 |
| 1179 // These steps must be done last, and must be done in this order; nothing | |
| 1180 // involving the tab should be done after didCloseTab:, and the | |
| 1181 // CRWWebController backing the tab should outlive anything done during tab | |
| 1182 // closure (since -[CRWWebController close] is what begins tearing down the | |
| 1183 // web/ layer, and tab closure may trigger operations that need to query the | |
| 1184 // web/ layer). The scoped strong ref is because didCloseTab: is often the | |
| 1185 // trigger for deallocating the tab, but that can in turn cause | |
| 1186 // CRWWebController to be deallocated before its close is called. The facade | |
| 1187 // delegate should be torn down after |-didCloseTab:| so components triggered | |
| 1188 // by tab closure can use the content facade, and it should be deleted before | |
| 1189 // the web controller since the web controller owns the facade's backing | |
| 1190 // objects. |parentTabModel_| is reset after calling |-didCloseTab:| to | |
| 1191 // prevent propagating WebState notifications that happen during WebState | |
| 1192 // destruction. | |
| 1193 // TODO(crbug.com/546222): Fix the need for this; TabModel should be | |
| 1194 // responsible for making the lifetime of Tab sane, rather than allowing Tab | |
| 1195 // to drive its own destruction. | |
| 1196 base::scoped_nsobject<Tab> kungFuDeathGrip([self retain]); | |
| 1197 [parentTabModel_ didCloseTab:self]; // Inform parent of tab closure. | |
| 1198 parentTabModel_ = nil; | |
| 1199 | |
| 1200 // Destroy the WebState but first stop listening to WebState events (as |self| | |
| 1201 // is in no state to respond to the notifications if |webStateImpl_| is null). | |
| 1202 LegacyTabHelper::RemoveFromWebState(self.webState); | |
| 1203 webStateObserver_.reset(); | 1075 webStateObserver_.reset(); |
| 1204 webStateImpl_.reset(); | 1076 webStateImpl_ = nullptr; |
| 1205 } | 1077 } |
| 1206 | 1078 |
| 1207 - (void)dismissModals { | 1079 - (void)dismissModals { |
| 1208 [openInController_ disable]; | 1080 [openInController_ disable]; |
| 1209 [self.webController dismissModals]; | 1081 [self.webController dismissModals]; |
| 1210 } | 1082 } |
| 1211 | 1083 |
| 1212 - (void)setShouldObserveInfoBarManager:(BOOL)shouldObserveInfoBarManager { | 1084 - (void)setShouldObserveInfoBarManager:(BOOL)shouldObserveInfoBarManager { |
| 1213 tabInfoBarObserver_->SetShouldObserveInfoBarManager( | 1085 tabInfoBarObserver_->SetShouldObserveInfoBarManager( |
| 1214 shouldObserveInfoBarManager); | 1086 shouldObserveInfoBarManager); |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1526 - (void)setSnapshotOverlayProvider: | 1398 - (void)setSnapshotOverlayProvider: |
| 1527 (id<SnapshotOverlayProvider>)snapshotOverlayProvider { | 1399 (id<SnapshotOverlayProvider>)snapshotOverlayProvider { |
| 1528 snapshotOverlayProvider_.reset(snapshotOverlayProvider); | 1400 snapshotOverlayProvider_.reset(snapshotOverlayProvider); |
| 1529 } | 1401 } |
| 1530 | 1402 |
| 1531 - (void)evaluateU2FResultFromURL:(const GURL&)URL { | 1403 - (void)evaluateU2FResultFromURL:(const GURL&)URL { |
| 1532 DCHECK(U2FController_); | 1404 DCHECK(U2FController_); |
| 1533 [U2FController_ evaluateU2FResultFromU2FURL:URL webState:self.webState]; | 1405 [U2FController_ evaluateU2FResultFromU2FURL:URL webState:self.webState]; |
| 1534 } | 1406 } |
| 1535 | 1407 |
| 1408 #pragma mark - CRWWebControllerObserver protocol methods. | |
| 1409 | |
| 1410 - (void)webControllerWillClose:(CRWWebController*)webController { | |
| 1411 DCHECK_EQ(webController, [self webController]); | |
| 1412 [[self webController] removeObserver:self]; | |
| 1413 [[self webController] setDelegate:nil]; | |
| 1414 } | |
| 1415 | |
| 1536 #pragma mark - CRWWebDelegate and CRWWebStateObserver protocol methods. | 1416 #pragma mark - CRWWebDelegate and CRWWebStateObserver protocol methods. |
| 1537 | 1417 |
| 1538 // This method is invoked whenever the system believes the URL is about to | 1418 // This method is invoked whenever the system believes the URL is about to |
| 1539 // change, or immediately after any unexpected change of the URL. The apparent | 1419 // change, or immediately after any unexpected change of the URL. The apparent |
| 1540 // destination URL is included in the |url| parameter. | 1420 // destination URL is included in the |url| parameter. |
| 1541 // Warning: because of the present design it is possible for malicious websites | 1421 // Warning: because of the present design it is possible for malicious websites |
| 1542 // to invoke superflous instances of this delegate with artibrary URLs. | 1422 // to invoke superflous instances of this delegate with artibrary URLs. |
| 1543 // Ensure there is nothing here that could be a risk to the user beyond mild | 1423 // Ensure there is nothing here that could be a risk to the user beyond mild |
| 1544 // confusion in that event (e.g. progress bar starting unexpectedly). | 1424 // confusion in that event (e.g. progress bar starting unexpectedly). |
| 1545 - (void)webWillAddPendingURL:(const GURL&)url | 1425 - (void)webWillAddPendingURL:(const GURL&)url |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2087 | 1967 |
| 2088 - (TabModel*)parentTabModel { | 1968 - (TabModel*)parentTabModel { |
| 2089 return parentTabModel_; | 1969 return parentTabModel_; |
| 2090 } | 1970 } |
| 2091 | 1971 |
| 2092 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 1972 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
| 2093 return inputAccessoryViewController_.get(); | 1973 return inputAccessoryViewController_.get(); |
| 2094 } | 1974 } |
| 2095 | 1975 |
| 2096 @end | 1976 @end |
| OLD | NEW |