wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 776550 - Provide API to start Compositor Parent with external thread/messageloop. r=cjones

Browse Source
This commit is contained in:
Oleg Romashin 2012-07-25 12:47:01 -07:00
parent 0d315c4beb
commit 9ca624ac9b
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/layers/ipc/CompositorParent.cpp
View File

@ -34,6 +34,12 @@ namespace layers {
// affects CrossProcessCompositorParent below.
static CompositorParent* sCurrentCompositor;
static Thread* sCompositorThread = nsnull;
// When ContentParent::StartUp() is called, we use the Thread global.
// When StartUpWithExistingThread() is used, we have to use the two
// duplicated globals, because there's no API to make a Thread from an
// existing thread.
static PlatformThreadId sCompositorThreadID = 0;
static MessageLoop* sCompositorLoop = nsnull;
struct LayerTreeState {
nsRefPtr<Layer> mRoot;
@ -59,8 +65,19 @@ struct PanZoomUserData : public LayerUserData {
*/
static const LayerTreeState* GetIndirectShadowTree(uint64_t aId);
void
CompositorParent::StartUpWithExistingThread(MessageLoop* aMsgLoop,
PlatformThreadId aThreadID)
{
MOZ_ASSERT(!sCompositorThread);
CreateCompositorMap();
sCompositorLoop = aMsgLoop;
sCompositorThreadID = aThreadID;
}
void CompositorParent::StartUp()
{
MOZ_ASSERT(!sCompositorLoop);
CreateCompositorMap();
CreateThread();
}
@ -74,7 +91,7 @@ void CompositorParent::ShutDown()
bool CompositorParent::CreateThread()
{
NS_ASSERTION(NS_IsMainThread(), "Should be on the main Thread!");
if (sCompositorThread) {
if (sCompositorThread || sCompositorLoop) {
return true;
}
sCompositorThread = new Thread("Compositor");
@ -93,11 +110,13 @@ void CompositorParent::DestroyThread()
delete sCompositorThread;
sCompositorThread = nsnull;
}
sCompositorLoop = nsnull;
sCompositorThreadID = 0;
}
MessageLoop* CompositorParent::CompositorLoop()
{
return sCompositorThread ? sCompositorThread->message_loop() : nsnull;
return sCompositorThread ? sCompositorThread->message_loop() : sCompositorLoop;
}
CompositorParent::CompositorParent(nsIWidget* aWidget,
@ -115,7 +134,7 @@ CompositorParent::CompositorParent(nsIWidget* aWidget,
, mPauseCompositionMonitor("PauseCompositionMonitor")
, mResumeCompositionMonitor("ResumeCompositionMonitor")
{
NS_ABORT_IF_FALSE(sCompositorThread != nsnull,
NS_ABORT_IF_FALSE(sCompositorThread != nsnull || sCompositorThreadID,
"The compositor thread must be Initialized before instanciating a COmpositorParent.");
MOZ_COUNT_CTOR(CompositorParent);
mCompositorID = 0;
@ -131,7 +150,7 @@ CompositorParent::CompositorParent(nsIWidget* aWidget,
PlatformThreadId
CompositorParent::CompositorThreadID()
{
return sCompositorThread->thread_id();
return sCompositorThread ? sCompositorThread->thread_id() : sCompositorThreadID;
}
CompositorParent::~CompositorParent()

9
gfx/layers/ipc/CompositorParent.h
View File

@ -138,6 +138,15 @@ public:
static PCompositorParent*
Create(Transport* aTransport, ProcessId aOtherProcess);
/**
* Setup external message loop and thread ID for Compositor.
* Should be used when CompositorParent should work in existing thread/MessageLoop,
* for example moving Compositor into native toolkit main thread will allow to avoid
* extra synchronization and call ::Composite() right from toolkit::Paint event
*/
static void StartUpWithExistingThread(MessageLoop* aMsgLoop,
PlatformThreadId aThreadID);
protected:
virtual PLayersParent* AllocPLayers(const LayersBackend& aBackendHint,
const uint64_t& aId,