Bug 1151890 - Explicitly set a null MessageLoop for the APZ controller thread on OS X. r=mstange

This commit is contained in:
Kartikaya Gupta 2015-04-07 16:53:41 -04:00
Родитель 194c589ef5
Коммит 0c2e1ab7dd
2 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -560,6 +560,7 @@ protected:
} }
void ConfigureAPZCTreeManager() override; void ConfigureAPZCTreeManager() override;
void ConfigureAPZControllerThread() override;
void DoRemoteComposition(const nsIntRect& aRenderRect); void DoRemoteComposition(const nsIntRect& aRenderRect);

Просмотреть файл

@ -60,6 +60,7 @@
#include "ScopedGLHelpers.h" #include "ScopedGLHelpers.h"
#include "HeapCopyOfStackArray.h" #include "HeapCopyOfStackArray.h"
#include "mozilla/layers/APZCTreeManager.h" #include "mozilla/layers/APZCTreeManager.h"
#include "mozilla/layers/APZThreadUtils.h"
#include "mozilla/layers/GLManager.h" #include "mozilla/layers/GLManager.h"
#include "mozilla/layers/CompositorOGL.h" #include "mozilla/layers/CompositorOGL.h"
#include "mozilla/layers/CompositorParent.h" #include "mozilla/layers/CompositorParent.h"
@ -1890,6 +1891,14 @@ nsChildView::ConfigureAPZCTreeManager()
gNumberOfWidgetsNeedingEventThread++; gNumberOfWidgetsNeedingEventThread++;
} }
void
nsChildView::ConfigureAPZControllerThread()
{
// On OS X the EventThreadRunner is the controller thread, but it doesn't
// have a MessageLoop.
APZThreadUtils::SetControllerThread(nullptr);
}
nsIntRect nsIntRect
nsChildView::RectContainingTitlebarControls() nsChildView::RectContainingTitlebarControls()
{ {