mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
update rgnrectallocator changes to match pending m-c patch.
This commit is contained in:
parent
14b0696047
commit
1de39e3ef4
@ -102,7 +102,7 @@ class RgnRectMemoryAllocator
|
||||
#elif defined (DEBUG)
|
||||
struct _ {
|
||||
_() { mThread = PR_CurrentThread(); }
|
||||
void* GetThread() { return mThread; }
|
||||
void* GetThread() { return mThread; }
|
||||
void* mThread;
|
||||
} _mOwningThread;
|
||||
|
||||
@ -146,7 +146,7 @@ public:
|
||||
|
||||
#if defined(DEBUG)
|
||||
void SetOwningThread(void* aOwningThread) {
|
||||
_mOwningThread.mThread = aOwningThread;
|
||||
_mOwningThread.mThread = aOwningThread;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
@ -71,6 +71,8 @@
|
||||
#include "nsIPrefBranch.h"
|
||||
#include "nsIPrefBranch2.h"
|
||||
|
||||
#include "nsRegion.h"
|
||||
|
||||
gfxPlatform *gPlatform = nsnull;
|
||||
|
||||
// These two may point to the same profile
|
||||
@ -182,6 +184,8 @@ gfxPlatform::Init()
|
||||
if (!gPlatform)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
nsRegion::MigrateToCurrentThread();
|
||||
|
||||
nsresult rv;
|
||||
|
||||
#if defined(XP_MACOSX)
|
||||
|
@ -66,8 +66,6 @@ GeckoThread::Init()
|
||||
// thus we never get crash reports when they fault. This call fixes it.
|
||||
message_loop()->set_exception_restoration(true);
|
||||
|
||||
nsRegion::MigrateToCurrentThread();
|
||||
|
||||
NS_LogInit();
|
||||
mXREEmbed.Start();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user