Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-04 05:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1350875 part 6 - Wait for window resize for one frame after window goes fullscreen. r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D68682
This commit is contained in:
Xidorn Quan 2020-07-15 12:21:45 +00:00
parent 0f6b1b3064
commit f62edc3be9
2 changed files with 91 additions and 0 deletions

47
xpfe/appshell/AppWindow.cpp

@ -109,6 +109,7 @@ AppWindow::AppWindow(uint32_t aChromeFlags)
mContentTreeOwner(nullptr),
mPrimaryContentTreeOwner(nullptr),
mModalStatus(NS_OK),
mFullscreenChangeState(FullscreenChangeState::NotChanging),
mContinueModalLoop(false),
mDebuting(false),
mChromeLoaded(false),
@ -2618,6 +2619,21 @@ bool AppWindow::WindowResized(nsIWidget* aWidget, int32_t aWidth,
// Persist size, but not immediately, in case this OS is firing
// repeated size events as the user drags the sizing handle
if (!IsLocked()) SetPersistenceTimer(PAD_POSITION | PAD_SIZE | PAD_MISC);
// Check if we need to continue a fullscreen change.
switch (mFullscreenChangeState) {
case FullscreenChangeState::WillChange:
mFullscreenChangeState = FullscreenChangeState::WidgetResized;
break;
case FullscreenChangeState::WidgetEnteredFullscreen:
FinishFullscreenChange(true);
break;
case FullscreenChangeState::WidgetExitedFullscreen:
FinishFullscreenChange(false);
break;
case FullscreenChangeState::WidgetResized:
case FullscreenChangeState::NotChanging:
break;
}
return true;
}
@ -2716,9 +2732,40 @@ void AppWindow::FullscreenWillChange(bool aInFullscreen) {
ourWindow->FullscreenWillChange(aInFullscreen);
}
}
MOZ_ASSERT(mFullscreenChangeState == FullscreenChangeState::NotChanging);
mFullscreenChangeState = FullscreenChangeState::WillChange;
}
void AppWindow::FullscreenChanged(bool aInFullscreen) {
if (mFullscreenChangeState == FullscreenChangeState::WidgetResized) {
FinishFullscreenChange(aInFullscreen);
} else {
NS_WARNING_ASSERTION(
mFullscreenChangeState == FullscreenChangeState::WillChange,
"Unexpected fullscreen change state");
FullscreenChangeState newState =
aInFullscreen ? FullscreenChangeState::WidgetEnteredFullscreen
: FullscreenChangeState::WidgetExitedFullscreen;
mFullscreenChangeState = newState;
nsCOMPtr<nsIAppWindow> kungFuDeathGrip(this);
// Wait for resize for a small amount of time.
// 80ms is actually picked arbitrarily. But it shouldn't be too large
// in case the widget resize is not going to happen at all, which can
// be the case for some Linux window managers and possibly Android.
NS_DelayedDispatchToCurrentThread(
NS_NewRunnableFunction(
"AppWindow::FullscreenChanged",
[this, kungFuDeathGrip, newState, aInFullscreen]() {
if (mFullscreenChangeState == newState) {
FinishFullscreenChange(aInFullscreen);
}
}),
80);
}
}
void AppWindow::FinishFullscreenChange(bool aInFullscreen) {
mFullscreenChangeState = FullscreenChangeState::NotChanging;
if (mDocShell) {
if (nsCOMPtr<nsPIDOMWindowOuter> ourWindow = mDocShell->GetWindow()) {
ourWindow->FinishFullscreenChange(aInFullscreen);

44
xpfe/appshell/AppWindow.h

@ -195,6 +195,8 @@ class AppWindow final : public nsIBaseWindow,
NS_IMETHOD ForceRoundedDimensions();
NS_IMETHOD GetAvailScreenSize(int32_t* aAvailWidth, int32_t* aAvailHeight);
void FinishFullscreenChange(bool aInFullscreen);
void ApplyChromeFlags();
MOZ_CAN_RUN_SCRIPT_BOUNDARY void SizeShell();
void OnChromeLoaded();
@ -245,6 +247,47 @@ class AppWindow final : public nsIBaseWindow,
nsresult GetPersistentValue(const nsAtom* aAttr, nsAString& aValue);
nsresult SetPersistentValue(const nsAtom* aAttr, const nsAString& aValue);
// Enum for the current state of a fullscreen change.
//
// It is used to ensure that fullscreen change is issued after both
// the window state change and the window size change at best effort.
// This is needed because some platforms can't guarantee the order
// between such two events.
//
// It's changed in the following way:
// +---------------------------+--------------------------------------+
// | | |
// | v |
// | NotChanging |
// | + |
// | | FullscreenWillChange |
// | v |
// | +-----------+ WillChange +------------------+ |
// | | WindowResized FullscreenChanged | |
// | v v |
// | WidgetResized WidgetEnteredFullscreen |
// | + or WidgetExitedFullscreen |
// | | FullscreenChanged + |
// | v WindowResized or | |
// +--------+ delayed dispatch | |
// v |
// +-------------+
//
// The delayed dispatch serves as timeout, which is necessary because it's
// not even guaranteed that the widget will be resized at all.
enum class FullscreenChangeState : uint8_t {
// No current fullscreen change. Any previous change has finished.
NotChanging,
// Indicate there is going to be a fullscreen change.
WillChange,
// The widget has been resized since WillChange.
WidgetResized,
// The widget has entered fullscreen state since WillChange.
WidgetEnteredFullscreen,
// The widget has exited fullscreen state since WillChange.
WidgetExitedFullscreen,
};
nsChromeTreeOwner* mChromeTreeOwner;
nsContentTreeOwner* mContentTreeOwner;
nsContentTreeOwner* mPrimaryContentTreeOwner;
@ -257,6 +300,7 @@ class AppWindow final : public nsIBaseWindow,
nsCOMPtr<nsIXULBrowserWindow> mXULBrowserWindow;
nsCOMPtr<nsIDocShellTreeItem> mPrimaryContentShell;
nsresult mModalStatus;
FullscreenChangeState mFullscreenChangeState;
bool mContinueModalLoop;
bool mDebuting; // being made visible right now
bool mChromeLoaded; // True when chrome has loaded