Bug 1335895 - part 10: Remove singleton shutdown of UiCompositorControllerChild from gfxPlatform::ShutdownLayersIPC now that UiCompositorControllerChild is per session r=dvander
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -85,17 +85,16 @@
#include "plstr.h"
#include "nsCRT.h"
#include "GLContext.h"
#include "GLContextProvider.h"
#include "mozilla/gfx/Logging.h"
#ifdef MOZ_WIDGET_ANDROID
#include "TexturePoolOGL.h"
-#include "mozilla/layers/UiCompositorControllerChild.h"
#endif
#ifdef USE_SKIA
# ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow"
# endif
# include "skia/include/core/SkGraphics.h"
@@ -985,19 +984,16 @@ gfxPlatform::ShutdownLayersIPC()
if (gfxPrefs::ChildProcessShutdown()) {
layers::CompositorBridgeChild::ShutDown();
layers::ImageBridgeChild::ShutDown();
}
} else if (XRE_IsParentProcess()) {
gfx::VRManagerChild::ShutDown();
layers::CompositorBridgeChild::ShutDown();
layers::ImageBridgeChild::ShutDown();
-#if defined(MOZ_WIDGET_ANDROID)
- layers::UiCompositorControllerChild::Shutdown();
-#endif // defined(MOZ_WIDGET_ANDROID)
// This has to happen after shutting down the child protocols.
layers::CompositorThreadHolder::Shutdown();
if (gfxVars::UseWebRender()) {
wr::RenderThread::ShutDown();
}
} else {
// TODO: There are other kind of processes and we should make sure gfx
// stuff is either not created there or shut down properly.