Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1868673 - Use StaticAutoPtr for gNeuteredWindows r=handyman

Browse Source 
Also, new is infallible, so remove a check.

Differential Revision: https://phabricator.services.mozilla.com/D195890
This commit is contained in:
Andrew McCreight 2023-12-11 20:15:42 +00:00
parent ee5299b22a
commit f4b66453c5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipc/glue/WindowsMessageLoop.cpp
View File

@ -20,6 +20,7 @@
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/mscom/Utils.h"
#include "mozilla/PaintTracker.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/WindowsProcessMitigations.h"
@ -89,7 +90,7 @@ const wchar_t kOldWndProcProp[] = L"MozillaIPCOldWndProc";
// This isn't defined before Windows XP.
enum { WM_XP_THEMECHANGED = 0x031A };
nsTArray<HWND>* gNeuteredWindows = nullptr;
static StaticAutoPtr<AutoTArray<HWND, 20>> gNeuteredWindows;
typedef nsTArray<UniquePtr<DeferredMessage>> DeferredMessageArray;
DeferredMessageArray* gDeferredMessages = nullptr;
@ -636,7 +637,6 @@ MessageChannel::SyncStackFrame::SyncStackFrame(MessageChannel* channel)
if (!mStaticPrev) {
NS_ASSERTION(!gNeuteredWindows, "Should only set this once!");
gNeuteredWindows = new AutoTArray<HWND, 20>();
NS_ASSERTION(gNeuteredWindows, "Out of memory!");
}
}
@ -655,7 +655,6 @@ MessageChannel::SyncStackFrame::~SyncStackFrame() {
if (!mStaticPrev) {
NS_ASSERTION(gNeuteredWindows, "Bad pointer!");
delete gNeuteredWindows;
gNeuteredWindows = nullptr;
}
}