diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER index 050bdb8edf..58ff75ee61 100644 --- a/browser_patches/firefox-beta/BUILD_NUMBER +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -1,2 +1,2 @@ -1327 -Changed: lushnikov@chromium.org Tue May 31 11:00:16 +03 2022 +1328 +Changed: yurys@chromium.org Wed 01 Jun 2022 08:28:56 PM PDT diff --git a/browser_patches/firefox-beta/patches/bootstrap.diff b/browser_patches/firefox-beta/patches/bootstrap.diff index 4ea7c74e28..a3f9d2bc50 100644 --- a/browser_patches/firefox-beta/patches/bootstrap.diff +++ b/browser_patches/firefox-beta/patches/bootstrap.diff @@ -1976,6 +1976,21 @@ index 3ce936fe3a4a83f9161eddc9e5289322d6a363e3..6b1c34244d8b2f2102ec423e2d96812f void updateTimeZone(); void internalResyncICUDefaultTimeZone(); +diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp +index 63f7f0524b0d87fb8b2950963888a27865a8d089..603d16543a7b0c4d20840ca5b2f12665dc310fa7 100644 +--- a/layout/base/PresShell.cpp ++++ b/layout/base/PresShell.cpp +@@ -10886,7 +10886,9 @@ auto PresShell::ComputeActiveness() const -> Activeness { + if (!browserChild->IsVisible()) { + MOZ_LOG(gLog, LogLevel::Debug, + (" > BrowserChild %p is not visible", browserChild)); +- return {false, inActiveTab}; ++ bool isActive; ++ root->GetDocShell()->GetForceActiveState(&isActive); ++ return {isActive, inActiveTab}; + } + + // If the browser is visible but just due to be preserving layers diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h index a384a0d00ce970a3e9db8983deaa012b45a76324..954bf59def43fdbb62924f35b45cde5f6c1a9fff 100644 --- a/layout/style/GeckoBindings.h diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index 406718af34..f2cafdf7fb 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1325 -Changed: lushnikov@chromium.org Tue May 31 12:42:47 +03 2022 +1326 +Changed: yurys@chromium.org Wed 01 Jun 2022 08:27:21 PM PDT diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff index 789a8a117a..941dcece90 100644 --- a/browser_patches/firefox/patches/bootstrap.diff +++ b/browser_patches/firefox/patches/bootstrap.diff @@ -1961,6 +1961,21 @@ index 3ce936fe3a4a83f9161eddc9e5289322d6a363e3..6b1c34244d8b2f2102ec423e2d96812f void updateTimeZone(); void internalResyncICUDefaultTimeZone(); +diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp +index 276efa425cf8450fb927f770b1d19aa1b5e9d179..471411459667e0864ea0c0f4ebc257327812d523 100644 +--- a/layout/base/PresShell.cpp ++++ b/layout/base/PresShell.cpp +@@ -10874,7 +10874,9 @@ auto PresShell::ComputeActiveness() const -> Activeness { + if (!browserChild->IsVisible()) { + MOZ_LOG(gLog, LogLevel::Debug, + (" > BrowserChild %p is not visible", browserChild)); +- return {false, inActiveTab}; ++ bool isActive; ++ root->GetDocShell()->GetForceActiveState(&isActive); ++ return {isActive, inActiveTab}; + } + + // If the browser is visible but just due to be preserving layers diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h index a384a0d00ce970a3e9db8983deaa012b45a76324..954bf59def43fdbb62924f35b45cde5f6c1a9fff 100644 --- a/layout/style/GeckoBindings.h @@ -2557,7 +2572,7 @@ diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings. index d3e5983259053175584254e7ac01ca9ce024f33a..97f5b851c402fea5477c0ee57af451c62b016eec 100644 --- a/widget/cocoa/NativeKeyBindings.mm +++ b/widget/cocoa/NativeKeyBindings.mm -@@ -492,6 +492,13 @@ +@@ -492,6 +492,13 @@ void NativeKeyBindings::GetEditCommandsForTests(NativeKeyBindingsType aType, break; case KEY_NAME_INDEX_ArrowLeft: if (aEvent.IsAlt()) { @@ -2571,7 +2586,7 @@ index d3e5983259053175584254e7ac01ca9ce024f33a..97f5b851c402fea5477c0ee57af451c6 break; } if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) { -@@ -512,6 +519,13 @@ +@@ -512,6 +519,13 @@ void NativeKeyBindings::GetEditCommandsForTests(NativeKeyBindingsType aType, break; case KEY_NAME_INDEX_ArrowRight: if (aEvent.IsAlt()) { @@ -2585,7 +2600,7 @@ index d3e5983259053175584254e7ac01ca9ce024f33a..97f5b851c402fea5477c0ee57af451c6 break; } if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) { -@@ -532,6 +546,10 @@ +@@ -532,6 +546,10 @@ void NativeKeyBindings::GetEditCommandsForTests(NativeKeyBindingsType aType, break; case KEY_NAME_INDEX_ArrowUp: if (aEvent.IsControl()) { @@ -2596,7 +2611,7 @@ index d3e5983259053175584254e7ac01ca9ce024f33a..97f5b851c402fea5477c0ee57af451c6 break; } if (aEvent.IsMeta()) { -@@ -541,7 +559,7 @@ +@@ -541,7 +559,7 @@ void NativeKeyBindings::GetEditCommandsForTests(NativeKeyBindingsType aType, instance->AppendEditCommandsForSelector( !aEvent.IsShift() ? ToObjcSelectorPtr(@selector(moveToBeginningOfDocument:)) @@ -2605,7 +2620,7 @@ index d3e5983259053175584254e7ac01ca9ce024f33a..97f5b851c402fea5477c0ee57af451c6 aCommands); break; } -@@ -564,6 +582,10 @@ +@@ -564,6 +582,10 @@ void NativeKeyBindings::GetEditCommandsForTests(NativeKeyBindingsType aType, break; case KEY_NAME_INDEX_ArrowDown: if (aEvent.IsControl()) {