Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1931609 - [1/1] Remove mLastSizeMode r=win-reviewers,handyman

Browse Source 
This is something of a followup to other simplification performed in
(e.g.) bug 1809057.

Differential Revision: https://phabricator.services.mozilla.com/D229200
This commit is contained in:
Ray Kraesig 2024-11-18 15:51:52 +00:00
parent 1ff9d45b00
commit 85702d9fc6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/windows/nsWindow.cpp
View File

@ -8592,7 +8592,6 @@ nsSizeMode nsWindow::FrameState::GetSizeMode() const { return mSizeMode; }
void nsWindow::FrameState::CheckInvariant() const {
MOZ_ASSERT(mSizeMode >= 0 && mSizeMode < nsSizeMode_Invalid);
MOZ_ASSERT(mLastSizeMode >= 0 && mLastSizeMode < nsSizeMode_Invalid);
MOZ_ASSERT(mPreFullscreenSizeMode >= 0 &&
mPreFullscreenSizeMode < nsSizeMode_Invalid);
MOZ_ASSERT(mWindow);
@ -8677,17 +8676,17 @@ void nsWindow::FrameState::OnFrameChanged() {
// of activating as needed. We also don't want to potentially trigger
// more focus / restore. Among other things, this addresses a bug on Win7
// related to window docking. (bug 489258)
const auto oldSizeMode = mSizeMode;
const auto newSizeMode =
GetSizeModeForWindowFrame(mWindow->mWnd, mFullscreenMode);
EnsureSizeMode(newSizeMode, DoShowWindow::No);
// If window was restored, activate the window now to get correct attributes.
if (mWindow->mIsVisible && mWindow->IsForegroundWindow() &&
mLastSizeMode == nsSizeMode_Minimized &&
oldSizeMode == nsSizeMode_Minimized &&
mSizeMode != nsSizeMode_Minimized) {
mWindow->DispatchFocusToTopLevelWindow(true);
}
mLastSizeMode = mSizeMode;
}
static void MaybeLogSizeMode(nsSizeMode aMode) {
@ -8707,7 +8706,6 @@ void nsWindow::FrameState::SetSizeModeInternal(nsSizeMode aMode,
mSizeMode == nsSizeMode_Fullscreen || aMode == nsSizeMode_Fullscreen;
const bool fullscreen = aMode == nsSizeMode_Fullscreen;
mLastSizeMode = mSizeMode;
mSizeMode = aMode;
MaybeLogSizeMode(mSizeMode);

2
widget/windows/nsWindow.h
View File

@ -491,8 +491,6 @@ class nsWindow final : public nsBaseWidget {
void SetSizeModeInternal(nsSizeMode, DoShowWindow);
nsSizeMode mSizeMode = nsSizeMode_Normal;
// XXX mLastSizeMode is rather bizarre and needs some documentation.
nsSizeMode mLastSizeMode = nsSizeMode_Normal;
// The old size mode before going into fullscreen mode. This should never
// be nsSizeMode_Fullscreen.
nsSizeMode mPreFullscreenSizeMode = nsSizeMode_Normal;