Bug 1792574, part 3 - Don't include nsMemory where it isn't needed. r…

…=xpcom-reviewers,necko-reviewers,valentin,nika There are only 3 places where nsMemory.h is still needed (image/RasterImage.cpp, gfx/thebes/gfxFT2FontList.cpp, and nsMemory.cpp). Remove the rest. Differential Revision: https://phabricator.services.mozilla.com/D158213
dothq · Sep 28, 2022 · 2da84b8 · 2da84b8
1 parent 31ae4fa
commit 2da84b8
Show file tree

Hide file tree

Showing 75 changed files with 0 additions and 82 deletions.
diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp
@@ -18,7 +18,6 @@
 #include "NullPrincipal.h"
 #include "DefaultURI.h"
 #include "nsSimpleURI.h"
-#include "nsMemory.h"
 #include "nsIClassInfoImpl.h"
 #include "nsNetCID.h"
 #include "nsError.h"

diff --git a/caps/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp
@@ -9,7 +9,6 @@
 #include "nsJSPrincipals.h"
 #include "plstr.h"
 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "nsStringBuffer.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/StaticPtr.h"

diff --git a/devtools/platform/JSDebugger.cpp b/devtools/platform/JSDebugger.cpp
@@ -10,7 +10,6 @@
 #include "jsfriendapi.h"
 #include "js/Wrapper.h"
 #include "nsServiceManagerUtils.h"
-#include "nsMemory.h"
 
 #define JSDEBUGGER_CONTRACTID "@mozilla.org/jsdebugger;1"
 

diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp
@@ -13,7 +13,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
 #include "nsIException.h"
-#include "nsMemory.h"
 #include "xpcprivate.h"
 
 #include "mozilla/dom/DOMExceptionBinding.h"

diff --git a/dom/base/nsTextFragment.cpp b/dom/base/nsTextFragment.cpp
@@ -13,7 +13,6 @@
 #include "nsTextFragment.h"
 #include "nsCRT.h"
 #include "nsReadableUtils.h"
-#include "nsMemory.h"
 #include "nsBidiUtils.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/CheckedInt.h"

diff --git a/dom/events/EventListenerService.cpp b/dom/events/EventListenerService.cpp
@@ -18,7 +18,6 @@
 #include "nsCOMArray.h"
 #include "nsINode.h"
 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "nsArray.h"
 #include "nsThreadUtils.h"

diff --git a/dom/file/MemoryBlobImpl.cpp b/dom/file/MemoryBlobImpl.cpp
@@ -9,7 +9,6 @@
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/SHA1.h"
 #include "nsIMemoryReporter.h"
-#include "nsMemory.h"
 #include "nsPrintfCString.h"
 #include "nsRFPService.h"
 #include "nsStringStream.h"

diff --git a/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp b/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp
@@ -21,7 +21,6 @@
 #include "mozilla/Services.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"

diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp
@@ -8,7 +8,6 @@
 #include "nsError.h"
 #include "mozilla/Components.h"
 #include "mozilla/dom/DOMStringList.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"

diff --git a/dom/xslt/xpath/txNodeSet.cpp b/dom/xslt/xpath/txNodeSet.cpp
@@ -5,7 +5,6 @@
 
 #include "txNodeSet.h"
 #include "txLog.h"
-#include "nsMemory.h"
 #include "txXPathTreeWalker.h"
 #include <algorithm>
 

diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
@@ -10,7 +10,6 @@
 #include "mozilla/dom/Document.h"
 #include "nsIStringBundle.h"
 #include "nsIURI.h"
-#include "nsMemory.h"
 #include "XPathResult.h"
 #include "txExecutionState.h"
 #include "txMozillaTextOutput.h"

diff --git a/editor/libeditor/InsertNodeTransaction.cpp b/editor/libeditor/InsertNodeTransaction.cpp
@@ -17,7 +17,6 @@
 #include "nsDebug.h"          // for NS_WARNING, etc.
 #include "nsError.h"          // for NS_ERROR_NULL_POINTER, etc.
 #include "nsIContent.h"       // for nsIContent
-#include "nsMemory.h"         // for nsMemory
 #include "nsReadableUtils.h"  // for ToNewCString
 #include "nsString.h"         // for nsString
 

diff --git a/editor/spellchecker/EditorSpellCheck.cpp b/editor/spellchecker/EditorSpellCheck.cpp
@@ -37,7 +37,6 @@
 #include "nsThreadUtils.h"     // for GetMainThreadSerialEventTarget
 #include "nsVariant.h"         // for nsIWritableVariant, etc
 #include "nsLiteralString.h"   // for NS_LITERAL_STRING, etc
-#include "nsMemory.h"          // for nsMemory
 #include "nsRange.h"
 #include "nsReadableUtils.h"        // for ToNewUnicode, EmptyString, etc
 #include "nsServiceManagerUtils.h"  // for do_GetService

diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp
@@ -18,7 +18,6 @@
 #include "mozilla/IntegerPrintfMacros.h"
 
 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "nsNativeCharsetUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedLibrary.h"

diff --git a/extensions/auth/nsAuthSSPI.cpp b/extensions/auth/nsAuthSSPI.cpp
@@ -18,7 +18,6 @@
 #include "nsDNSService2.h"
 #include "nsIDNSService.h"
 #include "nsIDNSRecord.h"
-#include "nsMemory.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"

diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
@@ -5,7 +5,6 @@
 
 #include "nsAuth.h"
 #include "nsAuthSambaNTLM.h"
-#include "nsMemory.h"
 #include "nspr.h"
 #include "prenv.h"
 #include "plbase64.h"

diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp
@@ -10,7 +10,6 @@
 #include "nsUnicodeProperties.h"
 #include "nsCRT.h"
 #include "mozilla/Likely.h"
-#include "nsMemory.h"
 
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(mozEnglishWordUtils, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(mozEnglishWordUtils, Release)

diff --git a/gfx/src/nsThebesFontEnumerator.cpp b/gfx/src/nsThebesFontEnumerator.cpp
@@ -14,7 +14,6 @@
 #include "nsError.h"              // for NS_OK, NS_FAILED, nsresult
 #include "nsAtom.h"               // for nsAtom, NS_Atomize
 #include "nsID.h"
-#include "nsMemory.h"  // for nsMemory
 #include "nsString.h"  // for nsAutoCString, nsAutoString, etc
 #include "nsTArray.h"  // for nsTArray, nsTArray_Impl, etc
 #include "nscore.h"    // for char16_t, NS_IMETHODIMP

diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIMemoryReporter.h"
-#include "nsMemory.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Base64.h"
 #include "mozilla/CheckedInt.h"

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -62,8 +62,6 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/gfxVars.h"
 
-#include "nsMemory.h"
-
 #include <dwmapi.h>
 #include <d3d11.h>
 #include <d2d1_1.h>

diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm
@@ -15,7 +15,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsString.h"
 #include "nsMimeTypes.h"
-#include "nsMemory.h"
 #include "nsIURL.h"
 #include "nsNetCID.h"
 #include "nsIPipe.h"

diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp
@@ -22,7 +22,6 @@
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsMimeTypes.h"
-#include "nsMemory.h"
 #include "nsIURL.h"
 #include "nsIPipe.h"
 #include "nsNetCID.h"

diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp
@@ -14,7 +14,6 @@
 #include "gfxPlatform.h"
 #include "imgFrame.h"
 #include "nsColor.h"
-#include "nsMemory.h"
 #include "nsRect.h"
 #include "nspr.h"
 #include "png.h"

diff --git a/intl/hyphenation/glue/nsHyphenationManager.cpp b/intl/hyphenation/glue/nsHyphenationManager.cpp
@@ -22,7 +22,6 @@
 #include "nsCRT.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsXULAppAPI.h"
 
 using namespace mozilla;

diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp
@@ -12,7 +12,6 @@
 #include "nsStringBundleService.h"
 #include "nsArrayEnumerator.h"
 #include "nscore.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"

diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
@@ -113,7 +113,6 @@
 #include "nsIComponentRegistrar.h"
 #include "nsISupportsPrimitives.h"
 #include "nsISimpleEnumerator.h"
-#include "nsMemory.h"
 #include "nsIXPConnect.h"
 #include "nsIXPCScriptable.h"
 #include "nsIObserver.h"

diff --git a/js/xpconnect/tests/components/native/xpctest_private.h b/js/xpconnect/tests/components/native/xpctest_private.h
@@ -10,7 +10,6 @@
 #define xpctest_private_h___
 
 #include "nsISupports.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "xpctest_attributes.h"
 #include "xpctest_params.h"

diff --git a/layout/generic/nsFloatManager.cpp b/layout/generic/nsFloatManager.cpp
@@ -21,7 +21,6 @@
 #include "nsIFrame.h"
 #include "nsIFrameInlines.h"
 #include "nsImageRenderer.h"
-#include "nsMemory.h"
 
 using namespace mozilla;
 using namespace mozilla::image;

diff --git a/modules/libjar/zipwriter/nsDeflateConverter.cpp b/modules/libjar/zipwriter/nsDeflateConverter.cpp
@@ -7,7 +7,6 @@
 #include "nsDeflateConverter.h"
 #include "nsStringStream.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"
 #include "nsCRT.h"
 #include "plstr.h"
 #include "mozilla/UniquePtr.h"

diff --git a/modules/libjar/zipwriter/nsZipDataStream.cpp b/modules/libjar/zipwriter/nsZipDataStream.cpp
@@ -10,7 +10,6 @@
 #include "nsDeflateConverter.h"
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"
 
 #define ZIP_METHOD_STORE 0
 #define ZIP_METHOD_DEFLATE 8

diff --git a/modules/libjar/zipwriter/nsZipHeader.cpp b/modules/libjar/zipwriter/nsZipHeader.cpp
@@ -5,7 +5,6 @@
 
 #include "StreamFunctions.h"
 #include "nsZipHeader.h"
-#include "nsMemory.h"
 #include "prtime.h"
 
 #define ZIP_FILE_HEADER_SIGNATURE 0x04034b50

diff --git a/modules/libjar/zipwriter/nsZipWriter.cpp b/modules/libjar/zipwriter/nsZipWriter.cpp
@@ -13,7 +13,6 @@
 #include "nsIStreamListener.h"
 #include "nsIInputStreamPump.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"
 #include "nsError.h"
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"

diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsHTTPCompressConv.h"
-#include "nsMemory.h"
 #include "plstr.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"

diff --git a/netwerk/wifi/nsWifiAccessPoint.cpp b/netwerk/wifi/nsWifiAccessPoint.cpp
@@ -4,7 +4,6 @@
 
 #include "nsWifiAccessPoint.h"
 #include "nsString.h"
-#include "nsMemory.h"
 #include "mozilla/Logging.h"
 
 extern mozilla::LazyLogModule gWifiMonitorLog;

diff --git a/parser/html/nsHtml5NamedCharacters.h b/parser/html/nsHtml5NamedCharacters.h
@@ -27,7 +27,6 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "mozilla/Logging.h"
-#include "nsMemory.h"
 
 struct nsHtml5CharacterName {
   uint16_t nameStart;

diff --git a/parser/html/nsHtml5NamedCharactersAccel.h b/parser/html/nsHtml5NamedCharactersAccel.h
@@ -13,7 +13,6 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "mozilla/Logging.h"
-#include "nsMemory.h"
 
 class nsHtml5NamedCharactersAccel {
  public:

diff --git a/storage/Variant.h b/storage/Variant.h
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "nsIVariant.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsTArray.h"
 

diff --git a/storage/mozStorageArgValueArray.cpp b/storage/mozStorageArgValueArray.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsString.h"
 
 #include "mozStoragePrivateHelpers.h"

diff --git a/storage/mozStorageAsyncStatement.cpp b/storage/mozStorageAsyncStatement.cpp
@@ -8,7 +8,6 @@
 #include <stdio.h>
 
 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"

diff --git a/storage/mozStorageAsyncStatementJSHelper.cpp b/storage/mozStorageAsyncStatementJSHelper.cpp
@@ -8,7 +8,6 @@
 #include "mozStorageAsyncStatement.h"
 #include "mozStorageService.h"
 
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
 

diff --git a/storage/mozStorageAsyncStatementParams.cpp b/storage/mozStorageAsyncStatementParams.cpp
@@ -7,7 +7,6 @@
 #include "mozStorageAsyncStatementParams.h"
 
 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsString.h"
 
 #include "jsapi.h"

diff --git a/storage/mozStorageStatement.cpp b/storage/mozStorageStatement.cpp
@@ -8,7 +8,6 @@
 #include <stdio.h>
 
 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
 #include "Variant.h"

diff --git a/storage/mozStorageStatementJSHelper.cpp b/storage/mozStorageStatementJSHelper.cpp
@@ -8,7 +8,6 @@
 #include "mozStorageStatement.h"
 #include "mozStorageService.h"
 
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
 

diff --git a/storage/mozStorageStatementParams.cpp b/storage/mozStorageStatementParams.cpp
@@ -7,7 +7,6 @@
 #include "mozStorageStatementParams.h"
 
 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsString.h"
 
 #include "jsapi.h"

diff --git a/storage/mozStorageStatementRow.cpp b/storage/mozStorageStatementRow.cpp
@@ -4,7 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsMemory.h"
 #include "nsString.h"
 
 #include "mozilla/ErrorResult.h"

diff --git a/storage/test/gtest/storage_test_harness.h b/storage/test/gtest/storage_test_harness.h
@@ -14,7 +14,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIThread.h"
 #include "nsThreadUtils.h"

diff --git a/toolkit/components/places/tests/gtest/places_test_harness.h b/toolkit/components/places/tests/gtest/places_test_harness.h
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
-#include "nsMemory.h"
 #include "nsThreadUtils.h"
 #include "nsDocShellCID.h"
 

diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
@@ -30,7 +30,6 @@
 #include "nsIObserverService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
-#include "nsMemory.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadManager.h"

diff --git a/toolkit/xre/MacLaunchHelper.mm b/toolkit/xre/MacLaunchHelper.mm
@@ -7,7 +7,6 @@
 
 #include "MacAutoreleasePool.h"
 #include "mozilla/UniquePtr.h"
-#include "nsMemory.h"
 
 #include <Cocoa/Cocoa.h>
 #include <crt_externs.h>