From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../components/sessionstore/SessionStoreChangeListener.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'toolkit/components/sessionstore') diff --git a/toolkit/components/sessionstore/SessionStoreChangeListener.cpp b/toolkit/components/sessionstore/SessionStoreChangeListener.cpp index f9de5ec9a0..753c7324fd 100644 --- a/toolkit/components/sessionstore/SessionStoreChangeListener.cpp +++ b/toolkit/components/sessionstore/SessionStoreChangeListener.cpp @@ -134,8 +134,7 @@ SessionStoreChangeListener::HandleEvent(dom::Event* aEvent) { /* static */ already_AddRefed SessionStoreChangeListener::Create(BrowsingContext* aBrowsingContext) { - MOZ_RELEASE_ASSERT( - StaticPrefs::browser_sessionstore_platform_collection_AtStartup()); + MOZ_RELEASE_ASSERT(SessionStorePlatformCollection()); if (!aBrowsingContext) { return nullptr; } @@ -356,9 +355,7 @@ void SessionStoreChangeListener::AddEventListeners() { if (EventTarget* target = GetEventTarget()) { target->AddSystemEventListener(kInput, this, false); target->AddSystemEventListener(kScroll, this, false); - if (StaticPrefs::browser_sessionstore_collect_zoom_AtStartup()) { - target->AddSystemEventListener(kResize, this, false); - } + target->AddSystemEventListener(kResize, this, false); mCurrentEventTarget = target; } } @@ -367,9 +364,7 @@ void SessionStoreChangeListener::RemoveEventListeners() { if (mCurrentEventTarget) { mCurrentEventTarget->RemoveSystemEventListener(kInput, this, false); mCurrentEventTarget->RemoveSystemEventListener(kScroll, this, false); - if (StaticPrefs::browser_sessionstore_collect_zoom_AtStartup()) { - mCurrentEventTarget->RemoveSystemEventListener(kResize, this, false); - } + mCurrentEventTarget->RemoveSystemEventListener(kResize, this, false); } mCurrentEventTarget = nullptr; -- cgit v1.2.3