Bug 1929626 - Remove more uses/includes of nsAlgorithm.h r=emilio,win-reviewers,gstoll

Differential Revision: https://phabricator.services.mozilla.com/D228203

dom/base/nsTextFragmentVMX.cpp

@@ -5,7 +5,6 @@
 // This file should only be compiled if you're on Power ISA.
 
 #include "nscore.h"
-#include "nsAlgorithm.h"
 #include "nsTextFragmentImpl.h"
 #include <algorithm>
 #include <altivec.h>

dom/file/FileReader.cpp

@@ -24,7 +24,6 @@
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/HoldDropJSObjects.h"
-#include "nsAlgorithm.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMJSUtils.h"
 #include "nsError.h"
@@ -312,7 +311,7 @@ nsresult FileReader::DoReadData(uint64_t aCount) {
       while (aCount > 0) {
         char tmpBuffer[4096];
         uint32_t minCount =
-            XPCOM_MIN(aCount, static_cast<uint64_t>(sizeof(tmpBuffer)));
+            std::min(aCount, static_cast<uint64_t>(sizeof(tmpBuffer)));
         uint32_t read = 0;
 
         nsresult rv = mAsyncStream->Read(tmpBuffer, minCount, &read);

dom/media/webm/WebMBufferedParser.cpp

@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "mozilla/CheckedInt.h"
-#include "nsAlgorithm.h"
 #include "nsThreadUtils.h"
 
 extern mozilla::LazyLogModule gMediaDemuxerLog;

dom/xhr/XMLHttpRequestMainThread.h

@@ -551,7 +551,7 @@ class XMLHttpRequestMainThread final : public XMLHttpRequest,
       bool operator<(const HeaderEntry& aOther) const {
         uint32_t selfLen = mName.Length();
         uint32_t otherLen = aOther.mName.Length();
-        uint32_t min = XPCOM_MIN(selfLen, otherLen);
+        uint32_t min = std::min(selfLen, otherLen);
         for (uint32_t i = 0; i < min; ++i) {
           unsigned char self = mName[i];
           unsigned char other = aOther.mName[i];

editor/libeditor/HTMLAbsPositionEditor.cpp

@@ -22,7 +22,6 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/EventTarget.h"
 #include "nsAString.h"
-#include "nsAlgorithm.h"
 #include "nsCOMPtr.h"
 #include "nsComputedDOMStyle.h"
 #include "nsDebug.h"

editor/libeditor/HTMLEditSubActionHandler.cpp

@@ -49,7 +49,6 @@
 #include "mozilla/dom/StaticRange.h"
 #include "mozilla/mozalloc.h"
 #include "nsAString.h"
-#include "nsAlgorithm.h"
 #include "nsAtom.h"
 #include "nsCRT.h"
 #include "nsCRTGlue.h"

editor/libeditor/HTMLEditorObjectResizer.cpp

@@ -21,7 +21,6 @@
 #include "mozilla/dom/MouseEvent.h"
 #include "mozilla/dom/EventTarget.h"
 #include "nsAString.h"
-#include "nsAlgorithm.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsError.h"

editor/libeditor/HTMLEditorState.cpp

@@ -23,7 +23,6 @@
 #include "mozilla/dom/Selection.h"
 
 #include "nsAString.h"
-#include "nsAlgorithm.h"
 #include "nsAtom.h"
 #include "nsDebug.h"
 #include "nsError.h"

editor/libeditor/HTMLTableEditor.cpp

@@ -22,7 +22,6 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "nsAString.h"
-#include "nsAlgorithm.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsError.h"

gfx/thebes/gfxPlatform.cpp

@@ -148,7 +148,6 @@ static const uint32_t kDefaultGlyphCacheSize = -1;
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
 
-#include "nsAlgorithm.h"
 #include "nsIGfxInfo.h"
 #include "nsIXULRuntime.h"
 #include "VsyncSource.h"

gfx/thebes/gfxXlibSurface.cpp

@@ -13,7 +13,6 @@
 #undef Data
 
 #include "nsTArray.h"
-#include "nsAlgorithm.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Preferences.h"
 #include <algorithm>

layout/svg/SVGTextFrame.cpp

@@ -16,7 +16,6 @@
 #include "gfxTypes.h"
 #include "gfxUtils.h"
 #include "LookAndFeel.h"
-#include "nsAlgorithm.h"
 #include "nsBidiPresUtils.h"
 #include "nsBlockFrame.h"
 #include "nsCaret.h"

layout/svg/SVGUtils.h

@@ -17,7 +17,6 @@
 #include "gfxPoint.h"
 #include "gfxRect.h"
 #include "mozilla/gfx/Rect.h"
-#include "nsAlgorithm.h"
 #include "nsChangeHint.h"
 #include "nsColor.h"
 #include "nsCOMPtr.h"

layout/tables/nsCellMap.h

@@ -9,7 +9,6 @@
 #include "celldata.h"
 #include "nsTArray.h"
 #include "nsCOMPtr.h"
-#include "nsAlgorithm.h"
 #include "nsRect.h"
 #include <algorithm>
 #include "TableArea.h"

testing/mochitest/ssltunnel/ssltunnel.cpp

@@ -24,7 +24,6 @@
 #include "prenv.h"
 #include "prnetdb.h"
 #include "prtpool.h"
-#include "nsAlgorithm.h"
 #include "nss.h"
 #include "keyhi.h"
 #include "ssl.h"

toolkit/components/aboutthirdparty/AboutThirdPartyUtils.cpp

@@ -13,7 +13,7 @@ namespace mozilla {
 int32_t CompareIgnoreCase(const nsAString& aStr1, const nsAString& aStr2) {
   uint32_t len1 = aStr1.Length();
   uint32_t len2 = aStr2.Length();
-  uint32_t lenMin = XPCOM_MIN(len1, len2);
+  uint32_t lenMin = std::min(len1, len2);
 
   int32_t result = nsCaseInsensitiveStringComparator(
       aStr1.BeginReading(), aStr2.BeginReading(), lenMin, lenMin);

widget/nsNativeTheme.h

@@ -9,7 +9,6 @@
 #ifndef _NSNATIVETHEME_H_
 #define _NSNATIVETHEME_H_
 
-#include "nsAlgorithm.h"
 #include "nsAtom.h"
 #include "nsColor.h"
 #include "nsCOMPtr.h"

widget/windows/IEnumFE.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IEnumFE.h"
-#include "nsAlgorithm.h"
 #include <algorithm>
 
 CEnumFormatEtc::CEnumFormatEtc() : mRefCnt(0), mCurrentIdx(0) {}