diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp index bef4f38774ac..b93ef4cc8111 100644 --- a/dom/plugins/ipc/PluginProcessChild.cpp +++ b/dom/plugins/ipc/PluginProcessChild.cpp @@ -128,11 +128,6 @@ PluginProcessChild::Init(int aArgc, char* aArgv[]) # error Sorry #endif - if (NS_FAILED(nsRegion::InitStatic())) { - NS_ERROR("Could not initialize nsRegion"); - return false; - } - bool retval = mPlugin.InitForChrome(pluginFilename, ParentPid(), IOThreadChild::message_loop(), IOThreadChild::channel()); @@ -164,8 +159,6 @@ PluginProcessChild::CleanUp() mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal); NS_LogTerm(); #endif - - nsRegion::ShutdownStatic(); } } // namespace plugins diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h index 70eaf96da02b..4665df5db0b4 100644 --- a/gfx/src/nsRegion.h +++ b/gfx/src/nsRegion.h @@ -93,15 +93,6 @@ public: aOther->mImpl = tmp; } - static - nsresult InitStatic() - { - return NS_OK; - } - - static - void ShutdownStatic() {} - void AndWith(const nsRegion& aOther) { And(*this, aOther); diff --git a/ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp b/ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp index d67b83ac6d23..bc085523477c 100644 --- a/ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp +++ b/ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp @@ -22,9 +22,6 @@ IPDLUnitTestProcessChild::Init(int aArgc, char* aArgv[]) ParentPid(), IOThreadChild::message_loop()); - if (NS_FAILED(nsRegion::InitStatic())) - return false; - return true; } diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index 9375ec82f017..b49aa11b7a53 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -161,11 +161,6 @@ nsLayoutStatics::Initialize() NS_SetStaticAtomsDone(); StartupJSEnvironment(); - rv = nsRegion::InitStatic(); - if (NS_FAILED(rv)) { - NS_ERROR("Could not initialize nsRegion"); - return rv; - } nsGlobalWindowInner::Init(); nsGlobalWindowOuter::Init(); @@ -423,8 +418,6 @@ nsLayoutStatics::Shutdown() mozilla::dom::FallbackEncoding::Shutdown(); - nsRegion::ShutdownStatic(); - mozilla::EventDispatcher::Shutdown(); HTMLInputElement::DestroyUploadLastDir();