diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/weblayer/browser/persistence/browser_persister.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/weblayer/browser/persistence/browser_persister.cc')
| -rw-r--r-- | chromium/weblayer/browser/persistence/browser_persister.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/chromium/weblayer/browser/persistence/browser_persister.cc b/chromium/weblayer/browser/persistence/browser_persister.cc index c7fe1a5c325..fac791261ab 100644 --- a/chromium/weblayer/browser/persistence/browser_persister.cc +++ b/chromium/weblayer/browser/persistence/browser_persister.cc @@ -18,13 +18,13 @@ #include "components/sessions/core/session_constants.h" #include "components/sessions/core/session_id.h" #include "components/sessions/core/session_types.h" -#include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/restore_type.h" #include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" +#include "weblayer/browser/browser_context_impl.h" #include "weblayer/browser/browser_impl.h" #include "weblayer/browser/persistence/browser_persistence_common.h" #include "weblayer/browser/profile_impl.h" @@ -105,8 +105,9 @@ void BrowserPersister::OnGeneratedNewCryptoKey( } void BrowserPersister::OnTabAdded(Tab* tab) { - content::WebContents* web_contents = - static_cast<TabImpl*>(tab)->web_contents(); + auto* tab_impl = static_cast<TabImpl*>(tab); + data_observer_.Add(tab_impl); + content::WebContents* web_contents = tab_impl->web_contents(); auto* tab_helper = sessions::SessionTabHelper::FromWebContents(web_contents); DCHECK(tab_helper); tab_helper->SetWindowID(browser_session_id_); @@ -130,10 +131,11 @@ void BrowserPersister::OnTabAdded(Tab* tab) { } void BrowserPersister::OnTabRemoved(Tab* tab, bool active_tab_changed) { + auto* tab_impl = static_cast<TabImpl*>(tab); + data_observer_.Remove(tab_impl); // Allow the associated sessionStorage to get deleted; it won't be needed // in the session restore. - content::WebContents* web_contents = - static_cast<TabImpl*>(tab)->web_contents(); + content::WebContents* web_contents = tab_impl->web_contents(); content::SessionStorageNamespace* session_storage_namespace = web_contents->GetController().GetDefaultSessionStorageNamespace(); session_storage_namespace->SetShouldPersist(false); @@ -161,6 +163,16 @@ void BrowserPersister::OnActiveTabChanged(Tab* tab) { browser_session_id_, index)); } +void BrowserPersister::OnDataChanged( + TabImpl* tab, + const std::map<std::string, std::string>& data) { + if (rebuild_on_next_save_) + return; + + ScheduleCommand( + sessions::CreateSetTabDataCommand(GetSessionIDForTab(tab), data)); +} + void BrowserPersister::SetTabUserAgentOverride( const SessionID& window_id, const SessionID& tab_id, |