Commit 8414dd0c authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

ios: Do not pass nullptr to web::GetItemWithUniqueID.

Bug: 1027429
Change-Id: Ic8d48b4a3a0a070bb850d5283ce688a8d4c1a703
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2456312Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815111}
parent acba8766
...@@ -2089,8 +2089,10 @@ void ReportOutOfSyncURLInDidStartProvisionalNavigation( ...@@ -2089,8 +2089,10 @@ void ReportOutOfSyncURLInDidStartProvisionalNavigation(
std::unique_ptr<web::NavigationContextImpl> navigationContext = std::unique_ptr<web::NavigationContextImpl> navigationContext =
[self.navigationStates removeNavigation:navigation]; [self.navigationStates removeNavigation:navigation];
[self loadCancelled]; [self loadCancelled];
web::NavigationItemImpl* item = web::GetItemWithUniqueID( web::NavigationItemImpl* item =
self.navigationManagerImpl, navigationContext.get()); navigationContext ? web::GetItemWithUniqueID(self.navigationManagerImpl,
navigationContext.get())
: nullptr;
if (self.navigationManagerImpl->GetPendingItem() == item) { if (self.navigationManagerImpl->GetPendingItem() == item) {
self.navigationManagerImpl->DiscardNonCommittedItems(); self.navigationManagerImpl->DiscardNonCommittedItems();
} }
...@@ -2114,7 +2116,9 @@ void ReportOutOfSyncURLInDidStartProvisionalNavigation( ...@@ -2114,7 +2116,9 @@ void ReportOutOfSyncURLInDidStartProvisionalNavigation(
web::NavigationContextImpl* navigationContext = web::NavigationContextImpl* navigationContext =
[self.navigationStates contextForNavigation:navigation]; [self.navigationStates contextForNavigation:navigation];
web::NavigationItemImpl* item = web::NavigationItemImpl* item =
web::GetItemWithUniqueID(self.navigationManagerImpl, navigationContext); navigationContext ? web::GetItemWithUniqueID(self.navigationManagerImpl,
navigationContext)
: nullptr;
if (item) { if (item) {
// Since the navigation has already been committed, it will retain its // Since the navigation has already been committed, it will retain its
// back / forward item even though the load has been cancelled. Update the // back / forward item even though the load has been cancelled. Update the
......
...@@ -17,6 +17,7 @@ namespace web { ...@@ -17,6 +17,7 @@ namespace web {
NavigationItemImpl* GetItemWithUniqueID( NavigationItemImpl* GetItemWithUniqueID(
NavigationManagerImpl* navigation_manager, NavigationManagerImpl* navigation_manager,
NavigationContextImpl* context) { NavigationContextImpl* context) {
DCHECK(context);
if (context->GetItem()) if (context->GetItem())
return context->GetItem(); return context->GetItem();
......
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