Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj

This was done by:

This was done by applying:

```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
         from subprocess import Popen, PIPE, check_output, CalledProcessError

         diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
-        args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+        args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']

         if not output_file:
             args.append("-i")
```

Then running `./mach clang-format -c <commit-hash>`

Then undoing that patch.

Then running check_spidermonkey_style.py --fixup

Then running `./mach clang-format`

I had to fix four things:

 * I needed to move <utility> back down in GuardObjects.h because I was hitting
   obscure problems with our system include wrappers like this:

0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94              ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94     MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94                                ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)

   Which I really didn't feel like digging into.

 * I had to restore the order of TrustOverrideUtils.h and related files in nss
   because the .inc files depend on TrustOverrideUtils.h being included earlier.

 * I had to add a missing include to RollingNumber.h

 * Also had to partially restore include order in JsepSessionImpl.cpp to avoid
   some -WError issues due to some static inline functions being defined in a
   header but not used in the rest of the compilation unit.

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

accessible/base/TextRange.h

@@ -8,6 +8,7 @@
 #define mozilla_a11y_TextRange_h__
 
 #include <utility>
+
 #include "nsCaseTreatment.h"
 #include "nsRect.h"
 #include "nsTArray.h"

accessible/ipc/win/COMPtrTypes.cpp

@@ -6,16 +6,17 @@
 
 #include "mozilla/a11y/COMPtrTypes.h"
 
-#include "MainThreadUtils.h"
-#include "mozilla/a11y/Accessible.h"
-#include "mozilla/a11y/Platform.h"
-#include "mozilla/a11y/HandlerProvider.h"
-#include "mozilla/Assertions.h"
 #include <utility>
-#include "mozilla/mscom/MainThreadHandoff.h"
-#include "mozilla/mscom/Utils.h"
+
+#include "MainThreadUtils.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/a11y/Accessible.h"
+#include "mozilla/a11y/HandlerProvider.h"
+#include "mozilla/a11y/Platform.h"
+#include "mozilla/mscom/MainThreadHandoff.h"
+#include "mozilla/mscom/Utils.h"
 #include "nsXULAppAPI.h"
 
 using mozilla::mscom::MainThreadHandoff;

accessible/ipc/win/HandlerProvider.cpp

@@ -6,6 +6,10 @@
 
 #include "mozilla/a11y/HandlerProvider.h"
 
+#include <memory.h>
+
+#include <utility>
+
 #include "Accessible2_3.h"
 #include "AccessibleDocument.h"
 #include "AccessibleRelation.h"
@@ -15,10 +19,10 @@
 #include "HandlerData.h"
 #include "HandlerData_i.c"
 #include "mozilla/Assertions.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/a11y/AccessibleWrap.h"
 #include "mozilla/a11y/HandlerDataCleanup.h"
 #include "mozilla/dom/ContentChild.h"
-#include <utility>
 #include "mozilla/mscom/AgileReference.h"
 #include "mozilla/mscom/FastMarshaler.h"
 #include "mozilla/mscom/Interceptor.h"
@@ -27,11 +31,8 @@
 #include "mozilla/mscom/Ptr.h"
 #include "mozilla/mscom/StructStream.h"
 #include "mozilla/mscom/Utils.h"
-#include "mozilla/UniquePtr.h"
-#include "nsThreadUtils.h"
 #include "nsTArray.h"
-
-#include <memory.h>
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace a11y {

accessible/ipc/win/handler/AccessibleHandlerControl.cpp

@@ -10,11 +10,10 @@
 
 #include "AccessibleHandlerControl.h"
 
-#include "AccessibleHandler.h"
+#include <utility>
 
 #include "AccessibleEventId.h"
-
-#include <utility>
+#include "AccessibleHandler.h"
 #include "mozilla/RefPtr.h"
 
 namespace mozilla {

accessible/xpcom/xpcAccessibleTextRange.h

@@ -7,11 +7,11 @@
 #ifndef mozilla_a11y_xpcAccessibleTextRange_h_
 #define mozilla_a11y_xpcAccessibleTextRange_h_
 
-#include "nsIAccessibleTextRange.h"
-#include "TextRange.h"
-
 #include <utility>
+
+#include "TextRange.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsIAccessibleTextRange.h"
 
 namespace mozilla {
 namespace a11y {

browser/app/winlauncher/ErrorHandler.cpp

@@ -6,18 +6,19 @@
 
 #include "ErrorHandler.h"
 
+#include <utility>
+
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/glue/WindowsDllServices.h"
 #include "mozilla/JSONWriter.h"
-#include <utility>
-#include "mozilla/mscom/ProcessRuntime.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
-#include "mozilla/WindowsVersion.h"
 #include "mozilla/WinTokenUtils.h"
+#include "mozilla/WindowsVersion.h"
 #include "mozilla/XREAppData.h"
+#include "mozilla/glue/WindowsDllServices.h"
+#include "mozilla/mscom/ProcessRuntime.h"
 #include "nsWindowsHelpers.h"
 
 #if defined(MOZ_LAUNCHER_PROCESS)

browser/app/winlauncher/ProcThreadAttributes.h

@@ -7,14 +7,15 @@
 #ifndef mozilla_ProcThreadAttributes_h
 #define mozilla_ProcThreadAttributes_h
 
+#include <windows.h>
+
+#include <utility>
+
 #include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
-#include <utility>
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
 
-#include <windows.h>
-
 namespace mozilla {
 
 class MOZ_RAII ProcThreadAttributes final {

browser/app/winlauncher/test/TestSameBinary.cpp

@@ -4,21 +4,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#include "SameBinary.h"
+#include <stdio.h>
+#include <stdlib.h>
 
+#include <utility>
+
+#include "SameBinary.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
-#include <utility>
 #include "mozilla/NativeNt.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Vector.h"
 #include "mozilla/WinHeaderOnlyUtils.h"
 #include "nsWindowsHelpers.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #define EXPECT_SAMEBINARY_IS(expected, option, message)                \
   do {                                                                 \
     mozilla::LauncherResult<bool> isSame =                             \

chrome/nsChromeRegistryChrome.h

@@ -6,11 +6,12 @@
 #ifndef nsChromeRegistryChrome_h
 #define nsChromeRegistryChrome_h
 
+#include <utility>
+
 #include "nsCOMArray.h"
 #include "nsChromeRegistry.h"
-#include "nsTArray.h"
-#include <utility>
 #include "nsClassHashtable.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace dom {

devtools/shared/heapsnapshot/DeserializedNode.h

@@ -6,13 +6,14 @@
 #ifndef mozilla_devtools_DeserializedNode__
 #define mozilla_devtools_DeserializedNode__
 
+#include <utility>
+
 #include "js/UbiNode.h"
 #include "js/UniquePtr.h"
-#include "mozilla/devtools/CoreDump.pb.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/Maybe.h"
-#include <utility>
 #include "mozilla/Vector.h"
+#include "mozilla/devtools/CoreDump.pb.h"
 
 // `Deserialized{Node,Edge}` translate protobuf messages from our core dump
 // format into structures we can rely upon for implementing `JS::ubi::Node`

devtools/shared/heapsnapshot/tests/gtest/DevTools.h

@@ -6,20 +6,20 @@
 #ifndef mozilla_devtools_gtest_DevTools__
 #define mozilla_devtools_gtest_DevTools__
 
-#include "CoreDump.pb.h"
-#include "jsapi.h"
-#include "jspubtd.h"
-#include "nsCRTGlue.h"
-
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "mozilla/devtools/HeapSnapshot.h"
-#include "mozilla/dom/ChromeUtils.h"
-#include "mozilla/CycleCollectedJSContext.h"
 #include <utility>
+
+#include "CoreDump.pb.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "js/Principals.h"
 #include "js/UbiNode.h"
 #include "js/UniquePtr.h"
+#include "jsapi.h"
+#include "jspubtd.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/devtools/HeapSnapshot.h"
+#include "mozilla/dom/ChromeUtils.h"
+#include "nsCRTGlue.h"
 
 using namespace mozilla;
 using namespace mozilla::devtools;

docshell/base/nsDocShell.h

@@ -7,22 +7,35 @@
 #ifndef nsDocShell_h__
 #define nsDocShell_h__
 
+#include <utility>
+
+#include "GeckoProfiler.h"
+#include "Units.h"
+#include "jsapi.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/HalScreenConfiguration.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
-#include <utility>
+#include "mozilla/ObservedDocShell.h"
+#include "mozilla/ScrollbarPreferences.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/TimelineConsumers.h"
+#include "mozilla/TimelineMarker.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
-
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ProfileTimelineMarkerBinding.h"
-#include "mozilla/gfx/Matrix.h"
 #include "mozilla/dom/ChildSHistory.h"
+#include "mozilla/dom/ProfileTimelineMarkerBinding.h"
 #include "mozilla/dom/WindowProxyHolder.h"
-
+#include "mozilla/gfx/Matrix.h"
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsCharsetSource.h"
+#include "nsContentPolicyUtils.h"
+#include "nsContentUtils.h"
+#include "nsDocLoader.h"
 #include "nsIAuthPromptProvider.h"
 #include "nsIBaseWindow.h"
 #include "nsIDeprecationWarner.h"
@@ -36,28 +49,11 @@
 #include "nsIWebNavigation.h"
 #include "nsIWebPageDescriptor.h"
 #include "nsIWebProgressListener.h"
-
-#include "nsAutoPtr.h"
-#include "nsCharsetSource.h"
-#include "nsCOMPtr.h"
-#include "nsContentPolicyUtils.h"
-#include "nsContentUtils.h"
-#include "nsCRT.h"
-#include "nsDocLoader.h"
 #include "nsPoint.h"  // mCurrent/mDefaultScrollbarPreferences
 #include "nsRect.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
-
-#include "GeckoProfiler.h"
-#include "jsapi.h"
 #include "prtime.h"
-#include "Units.h"
-
-#include "mozilla/ObservedDocShell.h"
-#include "mozilla/ScrollbarPreferences.h"
-#include "mozilla/TimelineConsumers.h"
-#include "mozilla/TimelineMarker.h"
 
 // Interfaces Needed
 

docshell/base/timeline/ObservedDocShell.cpp

@@ -6,10 +6,11 @@
 
 #include "ObservedDocShell.h"
 
+#include <utility>
+
 #include "AbstractTimelineMarker.h"
 #include "LayerTimelineMarker.h"
 #include "MainThreadUtils.h"
-#include <utility>
 #include "mozilla/AutoRestore.h"
 
 namespace mozilla {

dom/animation/KeyframeUtils.cpp

@@ -6,33 +6,34 @@
 
 #include "mozilla/KeyframeUtils.h"
 
+#include <algorithm>  // For std::stable_sort, std::min
+#include <utility>
+
+#include "js/ForOfIterator.h"  // For JS::ForOfIterator
+#include "jsapi.h"             // For most JSAPI
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/ErrorResult.h"
-#include <utility>
 #include "mozilla/RangedArray.h"
-#include "mozilla/ServoBindings.h"
 #include "mozilla/ServoBindingTypes.h"
+#include "mozilla/ServoBindings.h"
 #include "mozilla/ServoCSSParser.h"
-#include "mozilla/StyleAnimationValue.h"
 #include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StyleAnimationValue.h"
 #include "mozilla/TimingParams.h"
 #include "mozilla/dom/BaseKeyframeTypesBinding.h"  // For FastBaseKeyframe etc.
 #include "mozilla/dom/Document.h"  // For Document::AreWebAnimationsImplicitKeyframesEnabled
 #include "mozilla/dom/Element.h"
-#include "mozilla/dom/KeyframeEffectBinding.h"
 #include "mozilla/dom/KeyframeEffect.h"  // For PropertyValuesPair etc.
+#include "mozilla/dom/KeyframeEffectBinding.h"
 #include "mozilla/dom/Nullable.h"
-#include "jsapi.h"             // For most JSAPI
-#include "js/ForOfIterator.h"  // For JS::ForOfIterator
-#include "nsClassHashtable.h"
-#include "nsContentUtils.h"  // For GetContextForContent
 #include "nsCSSPropertyIDSet.h"
 #include "nsCSSProps.h"
 #include "nsCSSPseudoElements.h"  // For PseudoStyleType
+#include "nsClassHashtable.h"
+#include "nsContentUtils.h"  // For GetContextForContent
 #include "nsIScriptError.h"
 #include "nsPresContextInlines.h"
 #include "nsTArray.h"
-#include <algorithm>  // For std::stable_sort, std::min
 
 using mozilla::dom::Nullable;
 

dom/base/IdentifierMapEntry.h

@@ -11,15 +11,14 @@
 #ifndef mozilla_IdentifierMapEntry_h
 #define mozilla_IdentifierMapEntry_h
 
-#include "PLDHashTable.h"
-
-#include "mozilla/MemoryReporting.h"
 #include <utility>
-#include "mozilla/dom/TreeOrderedArray.h"
 
+#include "PLDHashTable.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/dom/TreeOrderedArray.h"
+#include "nsAtom.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "nsAtom.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
 #include "nsTHashtable.h"

dom/base/StructuredCloneHolder.h

@@ -7,10 +7,11 @@
 #ifndef mozilla_dom_StructuredCloneHolder_h
 #define mozilla_dom_StructuredCloneHolder_h
 
-#include "jsapi.h"
-#include "js/StructuredClone.h"
-#include "mozilla/MemoryReporting.h"
 #include <utility>
+
+#include "js/StructuredClone.h"
+#include "jsapi.h"
+#include "mozilla/MemoryReporting.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsTArray.h"

dom/base/nsDOMMutationObserver.h

@@ -7,26 +7,27 @@
 #ifndef nsDOMMutationObserver_h
 #define nsDOMMutationObserver_h
 
-#include "mozilla/Attributes.h"
 #include <utility>
-#include "nsCycleCollectionParticipant.h"
-#include "nsPIDOMWindow.h"
-#include "nsIScriptContext.h"
-#include "nsStubAnimationObserver.h"
-#include "nsCOMArray.h"
-#include "nsTArray.h"
-#include "nsIVariant.h"
-#include "nsContentList.h"
+
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/Animation.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
-#include "nsClassHashtable.h"
-#include "nsWrapperCache.h"
-#include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/MutationObserverBinding.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/Animation.h"
-#include "nsIAnimationObserver.h"
+#include "mozilla/dom/Nullable.h"
+#include "nsCOMArray.h"
+#include "nsClassHashtable.h"
+#include "nsContentList.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsGlobalWindow.h"
+#include "nsIAnimationObserver.h"
+#include "nsIScriptContext.h"
+#include "nsIVariant.h"
+#include "nsPIDOMWindow.h"
+#include "nsStubAnimationObserver.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
 
 class nsDOMMutationObserver;
 using mozilla::dom::MutationObservingInfo;

dom/base/nsQueryContentEventResult.cpp

@@ -4,11 +4,13 @@
  * 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 "nsQueryContentEventResult.h"
+
+#include <utility>
+
+#include "mozilla/TextEvents.h"
 #include "nsIWidget.h"
 #include "nsPoint.h"
-#include "nsQueryContentEventResult.h"
-#include <utility>
-#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 

dom/bindings/ErrorIPCUtils.h

@@ -7,11 +7,12 @@
 #ifndef IPC_ErrorIPCUtils_h
 #define IPC_ErrorIPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/Assertions.h"
 #include <utility>
 
+#include "ipc/IPCMessageUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/ErrorResult.h"
+
 namespace IPC {
 
 template <>

dom/bindings/ErrorResult.h

@@ -25,18 +25,19 @@
 #ifndef mozilla_ErrorResult_h
 #define mozilla_ErrorResult_h
 
-#include <new>
 #include <stdarg.h>
 
+#include <new>
+#include <utility>
+
 #include "js/GCAnnotations.h"
 #include "js/Value.h"
-#include "nscore.h"
-#include "nsString.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include <utility>
-#include "nsTArray.h"
 #include "nsISupportsImpl.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nscore.h"
 
 namespace IPC {
 class Message;

dom/bindings/Nullable.h

@@ -7,12 +7,12 @@
 #ifndef mozilla_dom_Nullable_h
 #define mozilla_dom_Nullable_h
 
-#include "mozilla/Assertions.h"
-#include "nsTArrayForwardDeclare.h"
-#include <utility>
-#include "mozilla/Maybe.h"
-
 #include <ostream>
+#include <utility>
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
+#include "nsTArrayForwardDeclare.h"
 
 class nsCycleCollectionTraversalCallback;
 

dom/bindings/Record.h

@@ -11,12 +11,13 @@
 #ifndef mozilla_dom_Record_h
 #define mozilla_dom_Record_h
 
-#include "nsTHashtable.h"
+#include <utility>
+
+#include "mozilla/Attributes.h"
 #include "nsHashKeys.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "mozilla/Attributes.h"
-#include <utility>
+#include "nsTHashtable.h"
 
 namespace mozilla {
 namespace dom {

dom/bindings/TypedArray.h

@@ -7,13 +7,14 @@
 #ifndef mozilla_dom_TypedArray_h
 #define mozilla_dom_TypedArray_h
 
-#include "jsfriendapi.h"  // js::Scalar
+#include <utility>
+
 #include "js/ArrayBuffer.h"
-#include "js/SharedArrayBuffer.h"
 #include "js/GCAPI.h"       // JS::AutoCheckCannotGC
 #include "js/RootingAPI.h"  // JS::Rooted
+#include "js/SharedArrayBuffer.h"
+#include "jsfriendapi.h"  // js::Scalar
 #include "mozilla/Attributes.h"
-#include <utility>
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/SpiderMonkeyInterface.h"
 #include "nsWrapperCache.h"

dom/events/GlobalKeyListener.cpp

@@ -4,29 +4,31 @@
  * 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 "nsCOMPtr.h"
 #include "GlobalKeyListener.h"
-#include "nsIContent.h"
-#include "nsAtom.h"
-#include "nsGkAtoms.h"
-#include "nsFocusManager.h"
-#include "nsNetUtil.h"
-#include "nsContentUtils.h"
-#include "nsPIDOMWindow.h"
-#include "nsIDocShell.h"
+
+#include <utility>
+
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/KeyEventHandler.h"
-#include <utility>
 #include "mozilla/Preferences.h"
+#include "mozilla/ShortcutKeys.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/EventBinding.h"
 #include "mozilla/dom/KeyboardEvent.h"
-#include "mozilla/ShortcutKeys.h"
+#include "nsAtom.h"
+#include "nsCOMPtr.h"
+#include "nsContentUtils.h"
+#include "nsFocusManager.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+#include "nsIDocShell.h"
+#include "nsNetUtil.h"
+#include "nsPIDOMWindow.h"
 
 namespace mozilla {
 

dom/file/MultipartBlobImpl.h

@@ -7,9 +7,10 @@
 #ifndef mozilla_dom_MultipartBlobImpl_h
 #define mozilla_dom_MultipartBlobImpl_h
 
+#include <utility>
+
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
-#include <utility>
 #include "mozilla/dom/BaseBlobImpl.h"
 
 namespace mozilla {

dom/html/HTMLFormElement.cpp

@@ -6,35 +6,35 @@
 
 #include "mozilla/dom/HTMLFormElement.h"
 
+#include <utility>
+
 #include "jsapi.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/BinarySearch.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/dom/BindContext.h"
-#include "mozilla/dom/nsCSPUtils.h"
-#include "mozilla/dom/nsCSPContext.h"
-#include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/dom/CustomEvent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLFormControlsCollection.h"
 #include "mozilla/dom/HTMLFormElementBinding.h"
-#include <utility>
+#include "mozilla/dom/nsCSPContext.h"
+#include "mozilla/dom/nsCSPUtils.h"
+#include "mozilla/dom/nsMixedContentBlocker.h"
+#include "nsAutoPtr.h"
+#include "nsCOMArray.h"
+#include "nsContentList.h"
+#include "nsContentUtils.h"
+#include "nsError.h"
 #include "nsGkAtoms.h"
 #include "nsHTMLDocument.h"
-#include "nsStyleConsts.h"
-#include "nsPresContext.h"
-#include "mozilla/dom/Document.h"
 #include "nsIFormControlFrame.h"
-#include "nsError.h"
-#include "nsContentUtils.h"
-#include "nsHTMLDocument.h"
 #include "nsInterfaceHashtable.h"
-#include "nsContentList.h"
-#include "nsCOMArray.h"
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
-#include "mozilla/BinarySearch.h"
+#include "nsPresContext.h"
 #include "nsQueryObject.h"
+#include "nsStyleConsts.h"
+#include "nsTArray.h"
 
 // form submission
 #include "HTMLFormSubmissionConstants.h"

dom/indexedDB/IDBObjectStore.cpp

@@ -6,6 +6,9 @@
 
 #include "IDBObjectStore.h"
 
+#include <numeric>
+#include <utility>
+
 #include "FileInfo.h"
 #include "IDBCursorType.h"
 #include "IDBDatabase.h"
@@ -19,42 +22,39 @@
 #include "IndexedDatabase.h"
 #include "IndexedDatabaseInlines.h"
 #include "IndexedDatabaseManager.h"
+#include "KeyPath.h"
+#include "ProfilerHelpers.h"
+#include "ReportInternalError.h"
 #include "js/Array.h"  // JS::GetArrayLength, JS::IsArrayObject
 #include "js/Class.h"
 #include "js/Date.h"
 #include "js/StructuredClone.h"
-#include "KeyPath.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/JSObjectHolder.h"
-#include <utility>
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/SystemGroup.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/BlobBinding.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FileBlobImpl.h"
 #include "mozilla/dom/IDBMutableFileBinding.h"
-#include "mozilla/dom/BlobBinding.h"
 #include "mozilla/dom/IDBObjectStoreBinding.h"
 #include "mozilla/dom/MemoryBlobImpl.h"
 #include "mozilla/dom/StreamBlobImpl.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/dom/StructuredCloneTags.h"
-#include "mozilla/dom/indexedDB/PBackgroundIDBSharedTypes.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerScope.h"
+#include "mozilla/dom/indexedDB/PBackgroundIDBSharedTypes.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
-#include "mozilla/SystemGroup.h"
 #include "nsCOMPtr.h"
 #include "nsIXPConnect.h"
 #include "nsQueryObject.h"
 #include "nsStreamUtils.h"
 #include "nsStringStream.h"
-#include "ProfilerHelpers.h"
-#include "ReportInternalError.h"
-
-#include <numeric>
 
 // Include this last to avoid path problems on Windows.
 #include "ActorsChild.h"

dom/indexedDB/IDBRequest.cpp

@@ -6,6 +6,8 @@
 
 #include "IDBRequest.h"
 
+#include <utility>
+
 #include "BackgroundChildImpl.h"
 #include "IDBCursor.h"
 #include "IDBDatabase.h"
@@ -15,11 +17,11 @@
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "IndexedDatabaseManager.h"
+#include "ReportInternalError.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/HoldDropJSObjects.h"
-#include <utility>
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/ErrorEventBinding.h"
 #include "mozilla/dom/IDBOpenDBRequestBinding.h"
@@ -28,11 +30,10 @@
 #include "mozilla/dom/WorkerRef.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "nsIGlobalObject.h"
 #include "nsIScriptContext.h"
 #include "nsJSUtils.h"
-#include "nsIGlobalObject.h"
 #include "nsString.h"
-#include "ReportInternalError.h"
 
 // Include this last to avoid path problems on Windows.
 #include "ActorsChild.h"

dom/ipc/BrowserChild.cpp

@@ -11,17 +11,50 @@
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/DocAccessibleChild.h"
 #endif
-#include "Layers.h"
-#include "ContentChild.h"
+#include <algorithm>
+#include <utility>
+
 #include "BrowserParent.h"
+#include "ClientLayerManager.h"
+#include "ContentChild.h"
+#include "DocumentInlines.h"
+#include "EventStateManager.h"
+#include "FrameLayerBuilder.h"
+#include "Layers.h"
+#include "MMPrinter.h"
+#include "PermissionMessageUtils.h"
+#include "PuppetWidget.h"
+#include "StructuredCloneData.h"
+#include "UnitTransforms.h"
+#include "Units.h"
+#include "VRManagerChild.h"
+#include "ipc/nsGUIEventIPC.h"
 #include "js/JSON.h"
-#include "mozilla/Preferences.h"
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BrowserElementParent.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/EventListenerManager.h"
+#include "mozilla/IMEStateManager.h"
+#include "mozilla/LookAndFeel.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/ResultExtensions.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StaticPrefs_layout.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/TouchEvents.h"
+#include "mozilla/Unused.h"
 #include "mozilla/dom/BrowserBridgeChild.h"
 #include "mozilla/dom/DataTransfer.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/JSWindowActorChild.h"
 #include "mozilla/dom/LoadURIOptionsBinding.h"
@@ -31,18 +64,19 @@
 #include "mozilla/dom/PBrowser.h"
 #include "mozilla/dom/PaymentRequestChild.h"
 #include "mozilla/dom/SessionStoreListener.h"
+#include "mozilla/dom/WindowGlobalChild.h"
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "mozilla/gfx/CrossProcessPaint.h"
+#include "mozilla/gfx/Matrix.h"
 #include "mozilla/gfx/gfxVars.h"
-#include "mozilla/IMEStateManager.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/URIUtils.h"
-#include "mozilla/layers/APZChild.h"
 #include "mozilla/layers/APZCCallbackHelper.h"
 #include "mozilla/layers/APZCTreeManagerChild.h"
+#include "mozilla/layers/APZChild.h"
 #include "mozilla/layers/APZEventState.h"
-#include "mozilla/layers/ContentProcessController.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
+#include "mozilla/layers/ContentProcessController.h"
 #include "mozilla/layers/DoubleTapToZoom.h"
 #include "mozilla/layers/IAPZCTreeManager.h"
 #include "mozilla/layers/ImageBridgeChild.h"
@@ -52,86 +86,51 @@
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/plugins/PPluginWidgetChild.h"
 #include "mozilla/recordreplay/ParentIPC.h"
-#include "mozilla/LookAndFeel.h"
-#include "mozilla/MouseEvents.h"
-#include <utility>
-#include "mozilla/PresShell.h"
-#include "mozilla/ProcessHangMonitor.h"
-#include "mozilla/ResultExtensions.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/Services.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/StaticPrefs_layout.h"
-#include "mozilla/TextEvents.h"
-#include "mozilla/TouchEvents.h"
-#include "mozilla/Unused.h"
-#include "Units.h"
 #include "nsBrowserStatusFilter.h"
+#include "nsColorPickerProxy.h"
+#include "nsCommandParams.h"
+#include "nsContentPermissionHelper.h"
 #include "nsContentUtils.h"
-#include "nsQueryActor.h"
+#include "nsDeviceContext.h"
 #include "nsDocShell.h"
+#include "nsDocShellLoadState.h"
 #include "nsEmbedCID.h"
-#include "nsGlobalWindow.h"
-#include <algorithm>
 #include "nsExceptionHandler.h"
 #include "nsFilePickerProxy.h"
-#include "mozilla/dom/Element.h"
+#include "nsFocusManager.h"
 #include "nsGlobalWindow.h"
 #include "nsIBaseWindow.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsIClassifiedChannel.h"
-#include "DocumentInlines.h"
-#include "nsFocusManager.h"
-#include "EventStateManager.h"
 #include "nsIDocShell.h"
 #include "nsIFrame.h"
+#include "nsILoadContext.h"
+#include "nsISHEntry.h"
+#include "nsISHistory.h"
+#include "nsIScriptError.h"
 #include "nsISecureBrowserUI.h"
 #include "nsIURI.h"
 #include "nsIURIMutator.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIWebBrowser.h"
 #include "nsIWebProgress.h"
+#include "nsLayoutUtils.h"
+#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 #include "nsPIWindowRoot.h"
 #include "nsPointerHashKeys.h"
-#include "nsLayoutUtils.h"
 #include "nsPrintfCString.h"
+#include "nsQueryActor.h"
+#include "nsQueryObject.h"
+#include "nsSandboxFlags.h"
+#include "nsString.h"
 #include "nsTHashtable.h"
 #include "nsThreadManager.h"
 #include "nsThreadUtils.h"
 #include "nsViewManager.h"
-#include "nsIWeakReferenceUtils.h"
-#include "nsWindowWatcher.h"
-#include "PermissionMessageUtils.h"
-#include "PuppetWidget.h"
-#include "StructuredCloneData.h"
 #include "nsViewportInfo.h"
-#include "nsILoadContext.h"
-#include "ipc/nsGUIEventIPC.h"
-#include "mozilla/gfx/Matrix.h"
-#include "UnitTransforms.h"
-#include "ClientLayerManager.h"
-#include "nsColorPickerProxy.h"
-#include "nsContentPermissionHelper.h"
-#include "nsNetUtil.h"
-#include "nsIScriptError.h"
-#include "mozilla/EventForwards.h"
-#include "nsDeviceContext.h"
-#include "nsSandboxFlags.h"
-#include "FrameLayerBuilder.h"
-#include "VRManagerChild.h"
-#include "nsCommandParams.h"
-#include "nsISHEntry.h"
-#include "nsISHistory.h"
-#include "nsQueryObject.h"
-#include "mozilla/dom/DocGroup.h"
-#include "nsString.h"
-#include "mozilla/Telemetry.h"
-#include "nsDocShellLoadState.h"
 #include "nsWebBrowser.h"
-#include "mozilla/dom/WindowGlobalChild.h"
-#include "MMPrinter.h"
-#include "mozilla/ResultExtensions.h"
+#include "nsWindowWatcher.h"
 
 #ifdef XP_WIN
 #  include "mozilla/plugins/PluginWidgetChild.h"

dom/ipc/BrowserParent.h

@@ -7,32 +7,33 @@
 #ifndef mozilla_dom_BrowserParent_h
 #define mozilla_dom_BrowserParent_h
 
-#include "js/TypeDecls.h"
+#include <utility>
+
 #include "LiveResizeListener.h"
+#include "Units.h"
+#include "js/TypeDecls.h"
 #include "mozilla/ContentCache.h"
-#include "mozilla/dom/ipc/IdType.h"
+#include "mozilla/EventForwards.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowserBridgeParent.h"
+#include "mozilla/dom/File.h"
 #include "mozilla/dom/PBrowserParent.h"
 #include "mozilla/dom/PContent.h"
 #include "mozilla/dom/PFilePickerParent.h"
 #include "mozilla/dom/TabContext.h"
-#include "mozilla/EventForwards.h"
-#include "mozilla/dom/File.h"
+#include "mozilla/dom/ipc/IdType.h"
 #include "mozilla/gfx/CrossProcessPaint.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layout/RemoteLayerTreeOwner.h"
-#include "mozilla/RefPtr.h"
-#include <utility>
 #include "nsCOMPtr.h"
 #include "nsIAuthPromptProvider.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsIDOMEventListener.h"
 #include "nsIKeyEventInPluginCallback.h"
+#include "nsIWidget.h"
 #include "nsIXULBrowserWindow.h"
 #include "nsRefreshDriver.h"
 #include "nsWeakReference.h"
-#include "Units.h"
-#include "nsIWidget.h"
 
 class nsFrameLoader;
 class nsIContent;

dom/ipc/ContentParent.cpp

@@ -26,15 +26,52 @@
 #  include "mozilla/a11y/AccessibleWrap.h"
 #  include "mozilla/a11y/Compatibility.h"
 #endif
+#include <utility>
+
+#include "BrowserParent.h"
+#include "ContentProcessManager.h"
+#include "Geolocation.h"
+#include "GfxInfoBase.h"
+#include "MMPrinter.h"
+#include "PreallocatedProcessManager.h"
+#include "ProcessPriorityManager.h"
+#include "SandboxHal.h"
+#include "SourceSurfaceRawData.h"
+#include "URIUtils.h"
+#include "gfxPlatform.h"
+#include "gfxPlatformFontList.h"
 #include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/BenchmarkStorageParent.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Components.h"
-#include "mozilla/StyleSheetInlines.h"
 #include "mozilla/DataStorage.h"
+#include "mozilla/GlobalStyleSheetCache.h"
+#include "mozilla/HangDetails.h"
+#include "mozilla/LoginReputationIPC.h"
+#include "mozilla/LookAndFeel.h"
+#include "mozilla/PerformanceMetricsCollector.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/ProcessHangMonitorIPC.h"
+#include "mozilla/RDDProcessManager.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/ScriptPreloader.h"
+#include "mozilla/Services.h"
+#include "mozilla/Sprintf.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StaticPrefs_media.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/StyleSheet.h"
+#include "mozilla/StyleSheetInlines.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryIPC.h"
+#include "mozilla/Unused.h"
+#include "mozilla/WebBrowserPersistDocumentParent.h"
 #include "mozilla/devtools/HeapSnapshotTempFileHelperParent.h"
 #include "mozilla/docshell/OfflineCacheUpdateParent.h"
+#include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/BrowserHost.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
@@ -42,17 +79,19 @@
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/ClientManager.h"
 #include "mozilla/dom/ClientOpenWindowOpActors.h"
-#include "mozilla/dom/ContentMediaController.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/ContentMediaController.h"
 #include "mozilla/dom/DataTransfer.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/ExternalHelperAppParent.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FileSystemSecurity.h"
+#include "mozilla/dom/GeolocationBinding.h"
+#include "mozilla/dom/GeolocationPositionError.h"
+#include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/IPCBlobInputStreamParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
-#include "mozilla/dom/ExternalHelperAppParent.h"
-#include "mozilla/dom/GetFilesHelper.h"
-#include "mozilla/dom/GeolocationBinding.h"
 #include "mozilla/dom/JSWindowActorService.h"
 #include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/dom/MediaController.h"
@@ -60,70 +99,58 @@
 #include "mozilla/dom/Notification.h"
 #include "mozilla/dom/PContentPermissionRequestParent.h"
 #include "mozilla/dom/PCycleCollectWithLogsParent.h"
-#include "mozilla/dom/GeolocationPositionError.h"
-#include "mozilla/dom/ServiceWorkerRegistrar.h"
-#include "mozilla/dom/power/PowerManagerService.h"
+#include "mozilla/dom/PPresentationParent.h"
+#include "mozilla/dom/ParentProcessMessageManager.h"
 #include "mozilla/dom/Permissions.h"
 #include "mozilla/dom/PresentationParent.h"
-#include "mozilla/dom/PPresentationParent.h"
+#include "mozilla/dom/ProcessMessageManager.h"
 #include "mozilla/dom/PushNotifier.h"
-#include "mozilla/dom/quota/QuotaManagerService.h"
-#include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/SHEntryParent.h"
 #include "mozilla/dom/SHistoryParent.h"
+#include "mozilla/dom/ServiceWorkerRegistrar.h"
+#include "mozilla/dom/ServiceWorkerUtils.h"
+#include "mozilla/dom/StorageIPC.h"
 #include "mozilla/dom/URLClassifierParent.h"
+#include "mozilla/dom/WakeLock.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/ipc/SharedMap.h"
+#include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "mozilla/dom/nsMixedContentBlocker.h"
+#include "mozilla/dom/power/PowerManagerService.h"
+#include "mozilla/dom/quota/QuotaManagerService.h"
 #include "mozilla/embedding/printingui/PrintingParent.h"
 #include "mozilla/extensions/StreamFilterParent.h"
-#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUProcessManager.h"
+#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/hal_sandbox/PHalParent.h"
+#include "mozilla/intl/LocaleService.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/CrashReporterHost.h"
 #include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
-#include "mozilla/ipc/PChildToParentStreamParent.h"
-#include "mozilla/ipc/TestShellParent.h"
-#include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/IPCStreamAlloc.h"
 #include "mozilla/ipc/IPCStreamDestination.h"
 #include "mozilla/ipc/IPCStreamSource.h"
-#include "mozilla/intl/LocaleService.h"
+#include "mozilla/ipc/IPCStreamUtils.h"
+#include "mozilla/ipc/PChildToParentStreamParent.h"
+#include "mozilla/ipc/TestShellParent.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
-#include "mozilla/layers/PAPZParent.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/LayerTreeOwnerTracker.h"
+#include "mozilla/layers/PAPZParent.h"
 #include "mozilla/loader/ScriptCacheActors.h"
-#include "mozilla/LoginReputationIPC.h"
-#include "mozilla/dom/StorageIPC.h"
-#include "mozilla/LookAndFeel.h"
 #include "mozilla/media/MediaParent.h"
-#include <utility>
-#include "mozilla/net/NeckoParent.h"
+#include "mozilla/mozSpellChecker.h"
 #include "mozilla/net/CookieServiceParent.h"
+#include "mozilla/net/NeckoMessageUtils.h"
+#include "mozilla/net/NeckoParent.h"
 #include "mozilla/net/PCookieServiceParent.h"
 #include "mozilla/plugins/PluginBridge.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/ProcessHangMonitor.h"
-#include "mozilla/ProcessHangMonitorIPC.h"
-#include "mozilla/RDDProcessManager.h"
+#include "mozilla/psm/PSMContentListener.h"
 #include "mozilla/recordreplay/ParentIPC.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/ScriptPreloader.h"
-#include "mozilla/Services.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/StaticPrefs_media.h"
-#include "mozilla/Telemetry.h"
-#include "mozilla/TelemetryIPC.h"
-#include "mozilla/WebBrowserPersistDocumentParent.h"
 #include "mozilla/widget/ScreenManager.h"
-#include "mozilla/Unused.h"
-#include "mozilla/HangDetails.h"
 #include "nsAnonymousTemporaryFile.h"
 #include "nsAppRunner.h"
 #include "nsCExternalHandlerService.h"
@@ -131,27 +158,33 @@
 #include "nsChromeRegistryChrome.h"
 #include "nsConsoleMessage.h"
 #include "nsConsoleService.h"
+#include "nsContentPermissionHelper.h"
 #include "nsContentUtils.h"
 #include "nsDebugImpl.h"
 #include "nsDirectoryServiceDefs.h"
+#include "nsDocShell.h"
 #include "nsEmbedCID.h"
 #include "nsFrameLoader.h"
 #include "nsFrameMessageManager.h"
 #include "nsHashPropertyBag.h"
+#include "nsHyphenationManager.h"
 #include "nsIAlertsService.h"
 #include "nsIAppStartup.h"
+#include "nsIAppWindow.h"
+#include "nsIAsyncInputStream.h"
+#include "nsIBidiKeyboard.h"
+#include "nsICaptivePortalService.h"
+#include "nsICertOverrideService.h"
 #include "nsIClipboard.h"
-#include "nsICookie.h"
-#include "nsContentPermissionHelper.h"
-#include "nsIContentSecurityPolicy.h"
 #include "nsIContentProcess.h"
-#include "nsICycleCollectorListener.h"
-#include "nsIDocShellTreeOwner.h"
-#include "mozilla/dom/Document.h"
-#include "Geolocation.h"
-#include "nsIDragService.h"
-#include "mozilla/dom/WakeLock.h"
+#include "nsIContentSecurityPolicy.h"
+#include "nsICookie.h"
 #include "nsICrashService.h"
+#include "nsICycleCollectorListener.h"
+#include "nsIDOMChromeWindow.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeOwner.h"
+#include "nsIDragService.h"
 #include "nsIExternalProtocolService.h"
 #include "nsIGfxInfo.h"
 #include "nsIIdleService.h"
@@ -169,69 +202,34 @@
 #include "nsIServiceWorkerManager.h"
 #include "nsISiteSecurityService.h"
 #include "nsISound.h"
-#include "mozilla/mozSpellChecker.h"
 #include "nsIStringBundle.h"
 #include "nsITimer.h"
+#include "nsITrackingDBService.h"
 #include "nsIURIFixup.h"
 #include "nsIURL.h"
-#include "nsIDocShellTreeOwner.h"
-#include "nsIAppWindow.h"
-#include "nsIDOMChromeWindow.h"
-#include "nsPIWindowWatcher.h"
-#include "nsThread.h"
-#include "nsWindowWatcher.h"
+#include "nsIWebBrowserChrome.h"
+#include "nsIX509Cert.h"
 #include "nsIXULRuntime.h"
-#include "mozilla/dom/ParentProcessMessageManager.h"
-#include "mozilla/dom/ProcessMessageManager.h"
-#include "mozilla/dom/nsMixedContentBlocker.h"
 #include "nsMemoryInfoDumper.h"
 #include "nsMemoryReporterManager.h"
+#include "nsOpenURIInFrameParams.h"
+#include "nsPIWindowWatcher.h"
+#include "nsPluginHost.h"
+#include "nsPluginTags.h"
 #include "nsQueryObject.h"
 #include "nsReadableUtils.h"
 #include "nsScriptError.h"
+#include "nsSerializationHelper.h"
 #include "nsServiceManagerUtils.h"
+#include "nsStreamUtils.h"
 #include "nsStyleSheetService.h"
+#include "nsThread.h"
 #include "nsThreadUtils.h"
 #include "nsWidgetsCID.h"
-#include "PreallocatedProcessManager.h"
-#include "ProcessPriorityManager.h"
-#include "SandboxHal.h"
-#include "SourceSurfaceRawData.h"
-#include "BrowserParent.h"
-#include "URIUtils.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsIDocShell.h"
-#include "nsDocShell.h"
-#include "nsOpenURIInFrameParams.h"
-#include "mozilla/net/NeckoMessageUtils.h"
-#include "GfxInfoBase.h"
-#include "gfxPlatform.h"
-#include "gfxPlatformFontList.h"
+#include "nsWindowWatcher.h"
 #include "prio.h"
 #include "private/pprio.h"
-#include "ContentProcessManager.h"
-#include "mozilla/dom/BlobURLProtocolHandler.h"
-#include "mozilla/dom/ipc/StructuredCloneData.h"
-#include "mozilla/PerformanceMetricsCollector.h"
-#include "mozilla/psm/PSMContentListener.h"
-#include "nsPluginHost.h"
-#include "nsPluginTags.h"
-#include "nsITrackingDBService.h"
-#include "mozilla/GlobalStyleSheetCache.h"
-#include "mozilla/StyleSheet.h"
-#include "mozilla/StyleSheetInlines.h"
-#include "nsICaptivePortalService.h"
-#include "nsIBidiKeyboard.h"
-#include "MMPrinter.h"
-#include "nsStreamUtils.h"
-#include "nsIAsyncInputStream.h"
 #include "xpcpublic.h"
-#include "nsHyphenationManager.h"
-#include "nsICertOverrideService.h"
-#include "nsIX509Cert.h"
-#include "nsSerializationHelper.h"
-
-#include "mozilla/Sprintf.h"
 
 #ifdef MOZ_WEBRTC
 #  include "signaling/src/peerconnection/WebrtcGlobalParent.h"

dom/media/doctor/MultiWriterQueue.h

@@ -7,13 +7,14 @@
 #ifndef mozilla_MultiWriterQueue_h_
 #define mozilla_MultiWriterQueue_h_
 
+#include <cstdint>
+#include <utility>
+
+#include "RollingNumber.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/MemoryReporting.h"
-#include <utility>
 #include "mozilla/Mutex.h"
 #include "prthread.h"
-#include "RollingNumber.h"
-#include <cstdint>
 
 namespace mozilla {
 

dom/media/doctor/RollingNumber.h

@@ -7,6 +7,7 @@
 #ifndef mozilla_RollingNumber_h_
 #define mozilla_RollingNumber_h_
 
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include <limits>
 

dom/media/eme/MediaKeySession.cpp

@@ -4,24 +4,26 @@
  * 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 "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/MediaKeySession.h"
-#include "mozilla/dom/MediaKeyError.h"
-#include "mozilla/dom/MediaKeyMessageEvent.h"
-#include "mozilla/dom/MediaEncryptedEvent.h"
-#include "mozilla/dom/MediaKeyStatusMap.h"
-#include "mozilla/dom/MediaKeySystemAccess.h"
-#include "mozilla/dom/KeyIdsInitDataBinding.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/CDMProxy.h"
-#include "mozilla/AsyncEventDispatcher.h"
+
+#include <ctime>
 #include <utility>
+
+#include "GMPUtils.h"
+#include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/CDMProxy.h"
 #include "mozilla/EMEUtils.h"
 #include "mozilla/Encoding.h"
-#include "GMPUtils.h"
+#include "mozilla/dom/HTMLMediaElement.h"
+#include "mozilla/dom/KeyIdsInitDataBinding.h"
+#include "mozilla/dom/MediaEncryptedEvent.h"
+#include "mozilla/dom/MediaKeyError.h"
+#include "mozilla/dom/MediaKeyMessageEvent.h"
+#include "mozilla/dom/MediaKeyStatusMap.h"
+#include "mozilla/dom/MediaKeySystemAccess.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsPrintfCString.h"
 #include "psshparser/PsshParser.h"
-#include <ctime>
 
 namespace mozilla {
 namespace dom {

dom/media/gmp/ChromiumCDMAdapter.cpp

@@ -4,15 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ChromiumCDMAdapter.h"
+
+#include <utility>
+
+#include "GMPLog.h"
+#include "VideoUtils.h"
+#include "WidevineUtils.h"
 #include "content_decryption_module.h"
 #include "content_decryption_module_ext.h"
-#include "VideoUtils.h"
 #include "gmp-api/gmp-entrypoints.h"
 #include "gmp-api/gmp-video-codec.h"
-#include "WidevineUtils.h"
-#include "GMPLog.h"
 #include "mozilla/HelperMacros.h"
-#include <utility>
 
 #ifdef XP_WIN
 #  include "WinUtils.h"

dom/media/mediacapabilities/MediaCapabilities.cpp

@@ -5,6 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaCapabilities.h"
+
+#include <inttypes.h>
+
+#include <utility>
+
 #include "AllocationPolicy.h"
 #include "Benchmark.h"
 #include "DecoderBenchmark.h"
@@ -15,7 +20,6 @@
 #include "PDMFactory.h"
 #include "VPXDecoder.h"
 #include "mozilla/ClearOnShutdown.h"
-#include <utility>
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/dom/DOMMozPromiseRequestHolder.h"
@@ -27,8 +31,6 @@
 #include "mozilla/layers/KnowsCompositor.h"
 #include "nsContentUtils.h"
 
-#include <inttypes.h>
-
 static mozilla::LazyLogModule sMediaCapabilitiesLog("MediaCapabilities");
 
 #define LOG(msg, ...) \

dom/media/systemservices/CamerasChild.h

@@ -8,11 +8,12 @@
 #define mozilla_CamerasChild_h
 
 #include <utility>
+
+#include "MediaEventSource.h"
+#include "mozilla/Mutex.h"
 #include "mozilla/Pair.h"
 #include "mozilla/camera/PCamerasChild.h"
 #include "mozilla/camera/PCamerasParent.h"
-#include "mozilla/Mutex.h"
-#include "MediaEventSource.h"
 #include "nsCOMPtr.h"
 
 // conflicts with #include of scoped_ptr.h

dom/media/systemservices/ShmemPool.cpp

@@ -5,9 +5,11 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ShmemPool.h"
+
+#include <utility>
+
 #include "mozilla/Assertions.h"
 #include "mozilla/Logging.h"
-#include <utility>
 
 mozilla::LazyLogModule sShmemPoolLog("ShmemPool");
 

dom/media/webm/WebMDecoder.cpp

@@ -5,7 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebMDecoder.h"
+
 #include <utility>
+
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_media.h"
 #ifdef MOZ_AV1

dom/media/webrtc/RTCCertificate.cpp

@@ -7,19 +7,19 @@
 #include "mozilla/dom/RTCCertificate.h"
 
 #include <cmath>
+#include <cstdio>
+#include <utility>
+
 #include "cert.h"
 #include "jsapi.h"
+#include "mozilla/Sprintf.h"
 #include "mozilla/dom/CryptoKey.h"
 #include "mozilla/dom/RTCCertificateBinding.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/dom/WebCryptoCommon.h"
 #include "mozilla/dom/WebCryptoTask.h"
-#include <utility>
-#include "mozilla/Sprintf.h"
 #include "mtransport/dtlsidentity.h"
 
-#include <cstdio>
-
 namespace mozilla {
 namespace dom {
 

dom/notification/Notification.cpp

@@ -6,22 +6,23 @@
 
 #include "mozilla/dom/Notification.h"
 
+#include <utility>
+
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/JSONWriter.h"
-#include <utility>
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
-
 #include "mozilla/dom/AppNotificationServiceOptionsBinding.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/NotificationEvent.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/Promise.h"
@@ -32,22 +33,20 @@
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/WorkerScope.h"
-
 #include "nsAlertsUtils.h"
+#include "nsCRTGlue.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentPermissionHelper.h"
 #include "nsContentUtils.h"
-#include "nsCRTGlue.h"
 #include "nsDOMJSUtils.h"
 #include "nsFocusManager.h"
 #include "nsGlobalWindow.h"
 #include "nsIAlertsService.h"
 #include "nsIContentPermissionPrompt.h"
-#include "mozilla/dom/Document.h"
 #include "nsILoadContext.h"
 #include "nsINotificationStorage.h"
-#include "nsIPermissionManager.h"
 #include "nsIPermission.h"
+#include "nsIPermissionManager.h"
 #include "nsIPushService.h"
 #include "nsIScriptError.h"
 #include "nsIServiceWorkerManager.h"

dom/presentation/PresentationRequest.cpp

@@ -6,29 +6,30 @@
 
 #include "PresentationRequest.h"
 
+#include <utility>
+
 #include "AvailabilityCollection.h"
 #include "ControllerConnectionCollection.h"
+#include "Presentation.h"
+#include "PresentationAvailability.h"
+#include "PresentationCallbacks.h"
+#include "PresentationLog.h"
+#include "PresentationTransportBuilderConstructor.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Navigator.h"
-#include "mozilla/dom/PresentationRequestBinding.h"
 #include "mozilla/dom/PresentationConnectionAvailableEvent.h"
+#include "mozilla/dom/PresentationRequestBinding.h"
 #include "mozilla/dom/Promise.h"
-#include <utility>
 #include "nsContentSecurityManager.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGlobalWindow.h"
-#include "mozilla/dom/Document.h"
 #include "nsIPresentationService.h"
 #include "nsIURI.h"
 #include "nsIUUIDGenerator.h"
 #include "nsNetUtil.h"
 #include "nsSandboxFlags.h"
 #include "nsServiceManagerUtils.h"
-#include "Presentation.h"
-#include "PresentationAvailability.h"
-#include "PresentationCallbacks.h"
-#include "PresentationLog.h"
-#include "PresentationTransportBuilderConstructor.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

dom/presentation/PresentationSessionInfo.cpp

@@ -4,17 +4,22 @@
  * 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 "PresentationSessionInfo.h"
+
+#include <utility>
+
+#include "PresentationLog.h"
+#include "PresentationService.h"
+#include "mozilla/Logging.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/HTMLIFrameElementBinding.h"
-#include "mozilla/dom/BrowserParent.h"
-#include "mozilla/Logging.h"
-#include <utility>
-#include "mozilla/Preferences.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
-#include "nsIDocShell.h"
 #include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
+#include "nsGlobalWindow.h"
+#include "nsIDocShell.h"
 #include "nsIMutableArray.h"
 #include "nsINetAddr.h"
 #include "nsISocketTransport.h"
@@ -23,9 +28,6 @@
 #include "nsQueryObject.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
-#include "PresentationLog.h"
-#include "PresentationService.h"
-#include "PresentationSessionInfo.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "nsIPresentationNetworkHelper.h"

dom/promise/Promise.h

@@ -7,20 +7,21 @@
 #ifndef mozilla_dom_Promise_h
 #define mozilla_dom_Promise_h
 
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include <utility>
-#include "mozilla/TimeStamp.h"
-#include "mozilla/TypeTraits.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/PromiseBinding.h"
-#include "mozilla/dom/ToJSValue.h"
-#include "mozilla/WeakPtr.h"
-#include "nsWrapperCache.h"
-#include "nsAutoPtr.h"
+
 #include "js/TypeDecls.h"
 #include "jspubtd.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/TypeTraits.h"
+#include "mozilla/WeakPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/PromiseBinding.h"
+#include "mozilla/dom/ToJSValue.h"
+#include "nsAutoPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsWrapperCache.h"
 
 class nsIGlobalObject;
 

dom/serviceworkers/ServiceWorkerEvents.cpp

@@ -8,27 +8,13 @@
 
 #include <utility>
 
-#include "nsAutoPtr.h"
-#include "nsContentUtils.h"
-#include "nsIConsoleReportCollector.h"
-#include "nsINetworkInterceptController.h"
-#include "nsIScriptError.h"
-#include "mozilla/Encoding.h"
-#include "nsContentPolicyUtils.h"
-#include "nsContentUtils.h"
-#include "nsComponentManagerUtils.h"
-#include "nsServiceManagerUtils.h"
-#include "nsStreamUtils.h"
-#include "nsNetCID.h"
-#include "nsNetUtil.h"
-#include "nsSerializationHelper.h"
-#include "nsQueryObject.h"
 #include "ServiceWorker.h"
 #include "ServiceWorkerManager.h"
-
+#include "js/Conversions.h"
+#include "js/TypeDecls.h"
+#include "mozilla/Encoding.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/LoadInfo.h"
-#include <utility>
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BodyUtil.h"
 #include "mozilla/dom/Client.h"
@@ -40,15 +26,25 @@
 #include "mozilla/dom/PushMessageDataBinding.h"
 #include "mozilla/dom/PushUtil.h"
 #include "mozilla/dom/Request.h"
+#include "mozilla/dom/Response.h"
 #include "mozilla/dom/ServiceWorkerOp.h"
 #include "mozilla/dom/TypedArray.h"
-#include "mozilla/dom/Response.h"
-#include "mozilla/dom/WorkerScope.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkerScope.h"
 #include "mozilla/net/NeckoChannelParams.h"
-
-#include "js/Conversions.h"
-#include "js/TypeDecls.h"
+#include "nsAutoPtr.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContentPolicyUtils.h"
+#include "nsContentUtils.h"
+#include "nsIConsoleReportCollector.h"
+#include "nsINetworkInterceptController.h"
+#include "nsIScriptError.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsQueryObject.h"
+#include "nsSerializationHelper.h"
+#include "nsServiceManagerUtils.h"
+#include "nsStreamUtils.h"
 #include "xpcpublic.h"
 
 using namespace mozilla;

dom/smil/SMILAnimationFunction.cpp

@@ -6,24 +6,26 @@
 
 #include "SMILAnimationFunction.h"
 
-#include "mozilla/dom/SVGAnimationElement.h"
-#include "mozilla/DebugOnly.h"
+#include <math.h>
+
+#include <algorithm>
 #include <utility>
+
+#include "mozilla/DebugOnly.h"
 #include "mozilla/SMILAttr.h"
 #include "mozilla/SMILCSSValueType.h"
 #include "mozilla/SMILNullType.h"
 #include "mozilla/SMILParserUtils.h"
 #include "mozilla/SMILTimedElement.h"
+#include "mozilla/dom/SVGAnimationElement.h"
 #include "nsAttrValueInlines.h"
-#include "nsGkAtoms.h"
-#include "nsCOMPtr.h"
 #include "nsCOMArray.h"
-#include "nsIContent.h"
+#include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
-#include <math.h>
-#include <algorithm>
 
 using namespace mozilla::dom;
 

dom/smil/SMILCSSProperty.cpp

@@ -8,14 +8,15 @@
 
 #include "SMILCSSProperty.h"
 
-#include "mozilla/dom/Element.h"
 #include <utility>
-#include "mozilla/ServoBindings.h"
+
 #include "mozilla/SMILCSSValueType.h"
 #include "mozilla/SMILValue.h"
+#include "mozilla/ServoBindings.h"
 #include "mozilla/StyleAnimationValue.h"
-#include "nsDOMCSSAttrDeclaration.h"
+#include "mozilla/dom/Element.h"
 #include "nsCSSProps.h"
+#include "nsDOMCSSAttrDeclaration.h"
 
 namespace mozilla {
 

dom/smil/SMILCompositor.h

@@ -8,13 +8,14 @@
 #define mozilla_SMILCompositor_h
 
 #include <utility>
-#include "mozilla/UniquePtr.h"
+
+#include "PLDHashTable.h"
+#include "SMILTargetIdentifier.h"
 #include "mozilla/SMILAnimationFunction.h"
 #include "mozilla/SMILCompositorTable.h"
-#include "nsTHashtable.h"
+#include "mozilla/UniquePtr.h"
 #include "nsString.h"
-#include "SMILTargetIdentifier.h"
-#include "PLDHashTable.h"
+#include "nsTHashtable.h"
 
 namespace mozilla {
 

dom/smil/SMILTimedElement.h

@@ -7,20 +7,21 @@
 #ifndef mozilla_SMILTimedElement_h
 #define mozilla_SMILTimedElement_h
 
-#include "mozilla/EventForwards.h"
 #include <utility>
-#include "mozilla/SMILMilestone.h"
+
+#include "mozilla/EventForwards.h"
 #include "mozilla/SMILInstanceTime.h"
 #include "mozilla/SMILInterval.h"
+#include "mozilla/SMILMilestone.h"
 #include "mozilla/SMILRepeatCount.h"
 #include "mozilla/SMILTimeValueSpec.h"
 #include "mozilla/SMILTypes.h"
 #include "mozilla/UniquePtr.h"
+#include "nsAttrValue.h"
+#include "nsAutoPtr.h"
+#include "nsHashKeys.h"
 #include "nsTArray.h"
 #include "nsTHashtable.h"
-#include "nsHashKeys.h"
-#include "nsAutoPtr.h"
-#include "nsAttrValue.h"
 
 class nsAtom;
 

dom/svg/SVGAnimatedClass.cpp

@@ -6,11 +6,12 @@
 
 #include "SVGAnimatedClass.h"
 
-#include "mozilla/dom/SVGElement.h"
 #include <utility>
-#include "mozilla/SMILValue.h"
+
 #include "DOMSVGAnimatedString.h"
 #include "SMILStringType.h"
+#include "mozilla/SMILValue.h"
+#include "mozilla/dom/SVGElement.h"
 
 namespace mozilla {
 namespace dom {

dom/svg/SVGAnimatedLengthList.cpp

@@ -7,11 +7,12 @@
 #include "SVGAnimatedLengthList.h"
 
 #include <utility>
+
+#include "DOMSVGAnimatedLengthList.h"
+#include "SVGLengthListSMILType.h"
 #include "mozilla/SMILValue.h"
 #include "mozilla/dom/SVGElement.h"
 #include "mozilla/dom/SVGLengthBinding.h"
-#include "DOMSVGAnimatedLengthList.h"
-#include "SVGLengthListSMILType.h"
 
 namespace mozilla {
 

dom/svg/SVGAnimatedNumberList.cpp

@@ -6,11 +6,12 @@
 
 #include "SVGAnimatedNumberList.h"
 
-#include "mozilla/dom/SVGElement.h"
 #include <utility>
-#include "mozilla/SMILValue.h"
+
 #include "DOMSVGAnimatedNumberList.h"
 #include "SVGNumberListSMILType.h"
+#include "mozilla/SMILValue.h"
+#include "mozilla/dom/SVGElement.h"
 
 using namespace mozilla::dom;
 

dom/svg/SVGAnimatedOrient.cpp

@@ -6,18 +6,19 @@
 
 #include "SVGAnimatedOrient.h"
 
+#include <utility>
+
+#include "DOMSVGAngle.h"
+#include "DOMSVGAnimatedAngle.h"
+#include "SVGAttrTearoffTable.h"
+#include "SVGOrientSMILType.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Maybe.h"
-#include <utility>
 #include "mozilla/SMILValue.h"
 #include "mozilla/dom/SVGMarkerElement.h"
-#include "DOMSVGAnimatedAngle.h"
-#include "DOMSVGAngle.h"
 #include "mozAutoDocUpdate.h"
 #include "nsContentUtils.h"
 #include "nsTextFormatter.h"
-#include "SVGAttrTearoffTable.h"
-#include "SVGOrientSMILType.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::dom::SVGAngle_Binding;

dom/svg/SVGAnimatedPathSegList.cpp

@@ -7,10 +7,11 @@
 #include "SVGAnimatedPathSegList.h"
 
 #include <utility>
-#include "mozilla/SMILValue.h"
-#include "mozilla/dom/SVGElement.h"
+
 #include "DOMSVGPathSegList.h"
 #include "SVGPathSegListSMILType.h"
+#include "mozilla/SMILValue.h"
+#include "mozilla/dom/SVGElement.h"
 
 using namespace mozilla::dom;
 

dom/svg/SVGAnimatedPointList.cpp

@@ -7,10 +7,11 @@
 #include "SVGAnimatedPointList.h"
 
 #include <utility>
-#include "mozilla/SMILValue.h"
-#include "mozilla/dom/SVGElement.h"
+
 #include "DOMSVGPointList.h"
 #include "SVGPointListSMILType.h"
+#include "mozilla/SMILValue.h"
+#include "mozilla/dom/SVGElement.h"
 
 using namespace mozilla::dom;
 

dom/svg/SVGAnimatedString.cpp

@@ -7,9 +7,10 @@
 #include "SVGAnimatedString.h"
 
 #include <utility>
-#include "mozilla/SMILValue.h"
+
 #include "SMILStringType.h"
 #include "SVGAttrTearoffTable.h"
+#include "mozilla/SMILValue.h"
 
 using namespace mozilla::dom;
 

dom/svg/SVGAnimatedTransformList.cpp

@@ -6,15 +6,16 @@
 
 #include "SVGAnimatedTransformList.h"
 
-#include "mozilla/dom/MutationEventBinding.h"
-#include "mozilla/dom/SVGAnimationElement.h"
 #include <utility>
-#include "mozilla/SMILValue.h"
-#include "mozilla/SVGContentUtils.h"
-#include "nsCharSeparatedTokenizer.h"
+
 #include "DOMSVGAnimatedTransformList.h"
 #include "SVGTransform.h"
 #include "SVGTransformListSMILType.h"
+#include "mozilla/SMILValue.h"
+#include "mozilla/SVGContentUtils.h"
+#include "mozilla/dom/MutationEventBinding.h"
+#include "mozilla/dom/SVGAnimationElement.h"
+#include "nsCharSeparatedTokenizer.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::dom::SVGTransform_Binding;

dom/svg/SVGAnimatedViewBox.cpp

@@ -9,11 +9,12 @@
 #include "mozAutoDocUpdate.h"
 #include "mozilla/Maybe.h"
 #include <utility>
+
+#include "SVGViewBoxSMILType.h"
 #include "mozilla/SMILValue.h"
 #include "mozilla/SVGContentUtils.h"
 #include "mozilla/dom/SVGRect.h"
 #include "nsCharSeparatedTokenizer.h"
-#include "SVGViewBoxSMILType.h"
 #include "nsTextFormatter.h"
 
 using namespace mozilla::dom;

dom/xslt/xpath/XPathEvaluator.cpp

@@ -4,24 +4,26 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/XPathEvaluator.h"
+
 #include <utility>
-#include "nsCOMPtr.h"
-#include "nsAtom.h"
-#include "mozilla/dom/XPathExpression.h"
+
 #include "XPathResult.h"
+#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/XPathEvaluatorBinding.h"
+#include "mozilla/dom/XPathExpression.h"
+#include "mozilla/dom/XPathNSResolverBinding.h"
+#include "nsAtom.h"
+#include "nsCOMPtr.h"
 #include "nsContentCID.h"
+#include "nsContentUtils.h"
+#include "nsDOMString.h"
+#include "nsError.h"
+#include "nsNameSpaceManager.h"
 #include "txExpr.h"
 #include "txExprParser.h"
-#include "nsError.h"
-#include "txURIUtils.h"
-#include "mozilla/dom/Document.h"
-#include "nsDOMString.h"
-#include "nsNameSpaceManager.h"
-#include "nsContentUtils.h"
 #include "txIXPathContext.h"
-#include "mozilla/dom/XPathEvaluatorBinding.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/XPathNSResolverBinding.h"
+#include "txURIUtils.h"
 
 namespace mozilla {
 namespace dom {

dom/xslt/xpath/XPathExpression.cpp

@@ -3,19 +3,21 @@
  * 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 <utility>
 #include "XPathExpression.h"
-#include "txExpr.h"
-#include "txExprResult.h"
-#include "txIXPathContext.h"
-#include "nsError.h"
-#include "nsINode.h"
+
+#include <utility>
+
 #include "XPathResult.h"
-#include "txURIUtils.h"
-#include "txXPathTreeWalker.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Text.h"
 #include "mozilla/dom/XPathResultBinding.h"
+#include "nsError.h"
+#include "nsINode.h"
+#include "txExpr.h"
+#include "txExprResult.h"
+#include "txIXPathContext.h"
+#include "txURIUtils.h"
+#include "txXPathTreeWalker.h"
 
 namespace mozilla {
 namespace dom {

dom/xslt/xpath/txExprParser.cpp

@@ -9,14 +9,16 @@
  * @see ExprLexer
  **/
 
-#include <utility>
 #include "txExprParser.h"
-#include "txExprLexer.h"
-#include "txExpr.h"
-#include "txStack.h"
-#include "nsGkAtoms.h"
+
+#include <utility>
+
 #include "nsError.h"
+#include "nsGkAtoms.h"
+#include "txExpr.h"
+#include "txExprLexer.h"
 #include "txIXPathContext.h"
+#include "txStack.h"
 #include "txStringUtils.h"
 #include "txXPathNode.h"
 #include "txXPathOptimizer.h"

dom/xslt/xslt/txInstructions.cpp

@@ -3,21 +3,23 @@
  * 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 <utility>
 #include "txInstructions.h"
+
+#include <utility>
+
 #include "nsError.h"
-#include "txExpr.h"
-#include "txStylesheet.h"
-#include "txNodeSetContext.h"
-#include "txTextHandler.h"
+#include "nsGkAtoms.h"
 #include "nsIConsoleService.h"
 #include "nsServiceManagerUtils.h"
-#include "txStringUtils.h"
-#include "nsGkAtoms.h"
-#include "txRtfHandler.h"
-#include "txNodeSorter.h"
-#include "txXSLTNumber.h"
 #include "txExecutionState.h"
+#include "txExpr.h"
+#include "txNodeSetContext.h"
+#include "txNodeSorter.h"
+#include "txRtfHandler.h"
+#include "txStringUtils.h"
+#include "txStylesheet.h"
+#include "txTextHandler.h"
+#include "txXSLTNumber.h"
 
 nsresult txApplyDefaultElementTemplate::execute(txExecutionState& aEs) {
   txExecutionState::TemplateRule* rule = aEs.getCurrentTemplateRule();

dom/xslt/xslt/txKeyFunctionCall.cpp

@@ -3,16 +3,17 @@
  * 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 "txExecutionState.h"
+#include <utility>
+
+#include "mozilla/HashFunctions.h"
 #include "nsGkAtoms.h"
+#include "nsReadableUtils.h"
+#include "txExecutionState.h"
+#include "txKey.h"
+#include "txNamespaceMap.h"
 #include "txSingleNodeContext.h"
 #include "txXSLTFunctions.h"
-#include "nsReadableUtils.h"
-#include "txKey.h"
 #include "txXSLTPatterns.h"
-#include "txNamespaceMap.h"
-#include "mozilla/HashFunctions.h"
-#include <utility>
 
 using namespace mozilla;
 

dom/xslt/xslt/txRtfHandler.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "txRtfHandler.h"
+
 #include <utility>
 
 txResultTreeFragment::txResultTreeFragment(nsAutoPtr<txResultBuffer>&& aBuffer)

dom/xslt/xslt/txStylesheet.cpp

@@ -3,18 +3,19 @@
  * 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 "mozilla/FloatingPoint.h"
+#include "txStylesheet.h"
+
 #include <utility>
 
-#include "txStylesheet.h"
+#include "mozilla/FloatingPoint.h"
 #include "txExpr.h"
-#include "txXSLTPatterns.h"
-#include "txToplevelItems.h"
 #include "txInstructions.h"
-#include "txXSLTFunctions.h"
-#include "txLog.h"
 #include "txKey.h"
+#include "txLog.h"
+#include "txToplevelItems.h"
 #include "txXPathTreeWalker.h"
+#include "txXSLTFunctions.h"
+#include "txXSLTPatterns.h"
 
 using mozilla::LogLevel;
 

dom/xslt/xslt/txStylesheetCompileHandlers.cpp

@@ -3,21 +3,22 @@
  * 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 "mozilla/ArrayUtils.h"
-#include "mozilla/FloatingPoint.h"
+#include "txStylesheetCompileHandlers.h"
+
 #include <utility>
 
-#include "txStylesheetCompiler.h"
-#include "txStylesheetCompileHandlers.h"
-#include "nsWhitespaceTokenizer.h"
-#include "txInstructions.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/FloatingPoint.h"
 #include "nsGkAtoms.h"
+#include "nsWhitespaceTokenizer.h"
 #include "txCore.h"
+#include "txInstructions.h"
+#include "txNamespaceMap.h"
+#include "txPatternParser.h"
 #include "txStringUtils.h"
 #include "txStylesheet.h"
+#include "txStylesheetCompiler.h"
 #include "txToplevelItems.h"
-#include "txPatternParser.h"
-#include "txNamespaceMap.h"
 #include "txURIUtils.h"
 #include "txXSLTFunctions.h"
 

dom/xslt/xslt/txStylesheetCompiler.cpp

@@ -3,25 +3,26 @@
  * 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 "mozilla/ArrayUtils.h"
-#include <utility>
-#include "mozilla/UniquePtr.h"
-
 #include "txStylesheetCompiler.h"
-#include "txStylesheetCompileHandlers.h"
+
+#include <utility>
+
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/UniquePtr.h"
 #include "nsGkAtoms.h"
-#include "txURIUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsTArray.h"
 #include "nsWhitespaceTokenizer.h"
-#include "txStylesheet.h"
-#include "txInstructions.h"
-#include "txToplevelItems.h"
 #include "txExprParser.h"
+#include "txInstructions.h"
 #include "txLog.h"
 #include "txPatternParser.h"
 #include "txStringUtils.h"
+#include "txStylesheet.h"
+#include "txStylesheetCompileHandlers.h"
+#include "txToplevelItems.h"
+#include "txURIUtils.h"
 #include "txXSLTFunctions.h"
-#include "nsServiceManagerUtils.h"
-#include "nsTArray.h"
 
 using namespace mozilla;
 using mozilla::dom::ReferrerPolicy;

dom/xslt/xslt/txToplevelItems.cpp

@@ -6,8 +6,9 @@
 #include "txToplevelItems.h"
 
 #include <utility>
-#include "txStylesheet.h"
+
 #include "txInstructions.h"
+#include "txStylesheet.h"
 #include "txXSLTPatterns.h"
 
 TX_IMPL_GETTYPE(txAttributeSetItem, txToplevelItem::attributeSet)

dom/xslt/xslt/txUnknownHandler.cpp

@@ -6,10 +6,11 @@
 #include "txUnknownHandler.h"
 
 #include <utility>
+
+#include "nsGkAtoms.h"
 #include "txExecutionState.h"
 #include "txStringUtils.h"
 #include "txStylesheet.h"
-#include "nsGkAtoms.h"
 
 txUnknownHandler::txUnknownHandler(txExecutionState* aEs)
     : mEs(aEs), mFlushed(false) {

editor/libeditor/HTMLEditSubActionHandler.cpp

@@ -4,20 +4,20 @@
  * 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 "HTMLEditor.h"
+#include <algorithm>
+#include <utility>
 
 #include "HTMLEditUtils.h"
+#include "HTMLEditor.h"
 #include "WSRunObject.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/CSSEditUtils.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/ContentIterator.h"
-#include "mozilla/CSSEditUtils.h"
 #include "mozilla/EditAction.h"
 #include "mozilla/EditorDOMPoint.h"
 #include "mozilla/EditorUtils.h"
 #include "mozilla/MathAlgorithms.h"
-#include <utility>
-#include "mozilla/mozalloc.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RangeUtils.h"
@@ -29,8 +29,10 @@
 #include "mozilla/dom/RangeBinding.h"
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/StaticRange.h"
+#include "mozilla/mozalloc.h"
 #include "nsAString.h"
 #include "nsAlgorithm.h"
+#include "nsAtom.h"
 #include "nsCRT.h"
 #include "nsCRTGlue.h"
 #include "nsComponentManagerUtils.h"
@@ -38,7 +40,6 @@
 #include "nsDebug.h"
 #include "nsError.h"
 #include "nsGkAtoms.h"
-#include "nsAtom.h"
 #include "nsHTMLDocument.h"
 #include "nsIContent.h"
 #include "nsID.h"
@@ -54,8 +55,6 @@
 #include "nsThreadUtils.h"
 #include "nsUnicharUtils.h"
 
-#include <algorithm>
-
 // Workaround for windows headers
 #ifdef SetProp
 #  undef SetProp

editor/libeditor/PlaceholderTransaction.cpp

@@ -5,10 +5,11 @@
 
 #include "PlaceholderTransaction.h"
 
+#include <utility>
+
 #include "CompositionTransaction.h"
 #include "mozilla/EditorBase.h"
 #include "mozilla/dom/Selection.h"
-#include <utility>
 #include "nsGkAtoms.h"
 #include "nsQueryObject.h"
 

editor/spellchecker/FilteredContentIterator.cpp

@@ -5,17 +5,17 @@
 
 #include "FilteredContentIterator.h"
 
-#include "mozilla/ContentIterator.h"
 #include <utility>
-#include "mozilla/mozalloc.h"
-#include "mozilla/dom/AbstractRange.h"
 
+#include "mozilla/ContentIterator.h"
+#include "mozilla/dom/AbstractRange.h"
+#include "mozilla/mozalloc.h"
+#include "nsAtom.h"
 #include "nsComponentManagerUtils.h"
 #include "nsComposeTxtSrvFilter.h"
 #include "nsContentUtils.h"
 #include "nsDebug.h"
 #include "nsError.h"
-#include "nsAtom.h"
 #include "nsIContent.h"
 #include "nsINode.h"
 #include "nsISupportsBase.h"

extensions/spellcheck/src/mozPersonalDictionary.cpp

@@ -4,27 +4,29 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozPersonalDictionary.h"
-#include "nsIUnicharInputStream.h"
-#include "nsReadableUtils.h"
-#include "nsIFile.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIObserverService.h"
-#include "nsIWeakReference.h"
-#include "nsCRT.h"
-#include "nsNetUtil.h"
-#include "nsNetCID.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsISafeOutputStream.h"
-#include "nsTArray.h"
-#include "nsStringEnumerator.h"
-#include "nsUnicharInputStream.h"
-#include "nsIRunnable.h"
-#include "nsThreadUtils.h"
-#include "nsProxyRelease.h"
-#include "prio.h"
+
 #include <utility>
 
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsCRT.h"
+#include "nsIFile.h"
+#include "nsIInputStream.h"
+#include "nsIObserverService.h"
+#include "nsIOutputStream.h"
+#include "nsIRunnable.h"
+#include "nsISafeOutputStream.h"
+#include "nsIUnicharInputStream.h"
+#include "nsIWeakReference.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsProxyRelease.h"
+#include "nsReadableUtils.h"
+#include "nsStringEnumerator.h"
+#include "nsTArray.h"
+#include "nsThreadUtils.h"
+#include "nsUnicharInputStream.h"
+#include "prio.h"
+
 #define MOZ_PERSONAL_DICT_NAME "persdict.dat"
 
 /**

gfx/2d/CaptureCommandList.h

@@ -7,13 +7,13 @@
 #ifndef mozilla_gfx_2d_CaptureCommandList_h
 #define mozilla_gfx_2d_CaptureCommandList_h
 
-#include <utility>
-#include "mozilla/PodOperations.h"
-#include <vector>
 #include <limits>
+#include <utility>
+#include <vector>
 
 #include "DrawCommand.h"
 #include "Logging.h"
+#include "mozilla/PodOperations.h"
 
 // Command object is stored into record with header containing size and
 // redundant size of whole record. Some platforms may require Command

gfx/2d/IterableArena.h

@@ -7,14 +7,15 @@
 #ifndef MOZILLA_GFX_ITERABLEARENA_H_
 #define MOZILLA_GFX_ITERABLEARENA_H_
 
-#include <utility>
-#include "mozilla/Assertions.h"
-#include "mozilla/gfx/Logging.h"
-
-#include <string.h>
-#include <vector>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
+
+#include <utility>
+#include <vector>
+
+#include "mozilla/Assertions.h"
+#include "mozilla/gfx/Logging.h"
 
 namespace mozilla {
 namespace gfx {

gfx/2d/Polygon.h

@@ -7,13 +7,13 @@
 #ifndef MOZILLA_GFX_POLYGON_H
 #define MOZILLA_GFX_POLYGON_H
 
-#include "Matrix.h"
+#include <initializer_list>
 #include <utility>
-#include "nsTArray.h"
+
+#include "Matrix.h"
 #include "Point.h"
 #include "Triangle.h"
-
-#include <initializer_list>
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace gfx {

gfx/2d/SFNTNameTable.cpp

@@ -6,9 +6,10 @@
 
 #include "SFNTNameTable.h"
 
+#include <utility>
+
 #include "BigEndianInts.h"
 #include "Logging.h"
-#include <utility>
 
 #if defined(XP_MACOSX)
 #  include <CoreFoundation/CoreFoundation.h>

gfx/2d/Tools.h

@@ -7,13 +7,15 @@
 #ifndef MOZILLA_GFX_TOOLS_H_
 #define MOZILLA_GFX_TOOLS_H_
 
+#include <math.h>
+
+#include <utility>
+
+#include "Point.h"
+#include "Types.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/MemoryReporting.h"  // for MallocSizeOf
-#include <utility>
 #include "mozilla/TypeTraits.h"
-#include "Types.h"
-#include "Point.h"
-#include <math.h>
 
 namespace mozilla {
 namespace gfx {

gfx/2d/Triangle.h

@@ -8,8 +8,8 @@
 #define MOZILLA_GFX_TRIANGLE_H
 
 #include <algorithm>
-
 #include <utility>
+
 #include "Point.h"
 #include "Rect.h"
 

gfx/gl/GLReadTexImageHelper.cpp

@@ -6,15 +6,15 @@
 
 #include "GLReadTexImageHelper.h"
 
-#include "gfx2DGlue.h"
-#include "gfxColor.h"
-#include "gfxTypes.h"
+#include <utility>
+
 #include "GLContext.h"
 #include "OGLShaderProgram.h"
 #include "ScopedGLHelpers.h"
-
+#include "gfx2DGlue.h"
+#include "gfxColor.h"
+#include "gfxTypes.h"
 #include "mozilla/gfx/2D.h"
-#include <utility>
 
 namespace mozilla {
 namespace gl {

gfx/layers/BSPTree.h

@@ -7,13 +7,13 @@
 #ifndef MOZILLA_LAYERS_BSPTREE_H
 #define MOZILLA_LAYERS_BSPTREE_H
 
-#include "mozilla/ArenaAllocator.h"
-#include "mozilla/gfx/Polygon.h"
-#include <utility>
-#include "mozilla/UniquePtr.h"
-#include "nsTArray.h"
-
 #include <list>
+#include <utility>
+
+#include "mozilla/ArenaAllocator.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/gfx/Polygon.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/BufferTexture.cpp

@@ -5,8 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "BufferTexture.h"
-#include "libyuv.h"
+
 #include <utility>
+
+#include "libyuv.h"
 #include "mozilla/fallible.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Logging.h"

gfx/layers/RotatedBuffer.cpp

@@ -5,30 +5,33 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "RotatedBuffer.h"
-#include <sys/types.h>              // for int32_t
-#include <algorithm>                // for max
-#include "BasicImplData.h"          // for BasicImplData
-#include "BasicLayersImpl.h"        // for ToData
-#include "GeckoProfiler.h"          // for AUTO_PROFILER_LABEL
-#include "Layers.h"                 // for PaintedLayer, Layer, etc
-#include "gfxPlatform.h"            // for gfxPlatform
-#include "gfxUtils.h"               // for gfxUtils
-#include "mozilla/ArrayUtils.h"     // for ArrayLength
+
+#include <sys/types.h>  // for int32_t
+
+#include <algorithm>  // for max
+#include <utility>    // for Move
+
+#include "BasicImplData.h"    // for BasicImplData
+#include "BasicLayersImpl.h"  // for ToData
+#include "GeckoProfiler.h"    // for AUTO_PROFILER_LABEL
+#include "Layers.h"           // for PaintedLayer, Layer, etc
+#include "PaintThread.h"
+#include "gfx2DGlue.h"
+#include "gfxPlatform.h"         // for gfxPlatform
+#include "gfxUtils.h"            // for gfxUtils
+#include "mozilla/ArrayUtils.h"  // for ArrayLength
+#include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/gfx/BasePoint.h"  // for BasePoint
 #include "mozilla/gfx/BaseRect.h"   // for BaseRect
 #include "mozilla/gfx/BaseSize.h"   // for BaseSize
 #include "mozilla/gfx/Matrix.h"     // for Matrix
 #include "mozilla/gfx/Point.h"      // for Point, IntPoint
+#include "mozilla/gfx/Point.h"      // for IntSize
 #include "mozilla/gfx/Rect.h"       // for Rect, IntRect
 #include "mozilla/gfx/Types.h"      // for ExtendMode::ExtendMode::CLAMP, etc
 #include "mozilla/layers/ShadowLayers.h"   // for ShadowableLayer
 #include "mozilla/layers/TextureClient.h"  // for TextureClient
-#include <utility>                         // for Move
-#include "mozilla/StaticPrefs_layers.h"
-#include "mozilla/gfx/Point.h"  // for IntSize
-#include "gfx2DGlue.h"
-#include "nsLayoutUtils.h"  // for invalidation debugging
-#include "PaintThread.h"
+#include "nsLayoutUtils.h"                 // for invalidation debugging
 
 namespace mozilla {
 

gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp

@@ -7,11 +7,15 @@
 #include "mozilla/layers/AndroidDynamicToolbarAnimator.h"
 
 #include <cmath>
+#include <utility>
 
 #include "APZCTreeManager.h"
 #include "FrameMetrics.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/MathAlgorithms.h"
+#include "mozilla/StaticPrefs_browser.h"
+#include "mozilla/Unused.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Types.h"
 #include "mozilla/layers/APZThreadUtils.h"
@@ -21,10 +25,6 @@
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/UiCompositorControllerMessageTypes.h"
 #include "mozilla/layers/UiCompositorControllerParent.h"
-#include "mozilla/MathAlgorithms.h"
-#include <utility>
-#include "mozilla/StaticPrefs_browser.h"
-#include "mozilla/Unused.h"
 
 namespace {
 

gfx/layers/apz/util/APZEventState.cpp

@@ -6,20 +6,24 @@
 
 #include "APZEventState.h"
 
-#include "ActiveElementManager.h"
-#include "APZCCallbackHelper.h"
-
-#include "LayersLogging.h"
-#include "mozilla/BasicEvents.h"
-#include "mozilla/dom/MouseEventBinding.h"
-#include "mozilla/dom/BrowserChild.h"
-#include "mozilla/dom/TabGroup.h"
-#include "mozilla/IntegerPrintfMacros.h"
 #include <utility>
+
+#include "APZCCallbackHelper.h"
+#include "ActiveElementManager.h"
+#include "LayersLogging.h"
+#include "TouchManager.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StaticPrefs_ui.h"
 #include "mozilla/TouchEvents.h"
+#include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/MouseEventBinding.h"
+#include "mozilla/dom/TabGroup.h"
 #include "mozilla/layers/APZCCallbackHelper.h"
+#include "mozilla/widget/nsAutoRollup.h"
 #include "nsCOMPtr.h"
 #include "nsDocShell.h"
 #include "nsIDOMWindowUtils.h"
@@ -31,14 +35,6 @@
 #include "nsIWidget.h"
 #include "nsLayoutUtils.h"
 #include "nsQueryFrame.h"
-#include "TouchManager.h"
-#include "nsLayoutUtils.h"
-#include "nsIScrollableFrame.h"
-#include "nsIScrollbarMediator.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/StaticPrefs_ui.h"
-#include "mozilla/TouchEvents.h"
-#include "mozilla/widget/nsAutoRollup.h"
 
 #define APZES_LOG(...)
 // #define APZES_LOG(...) printf_stderr("APZES: " __VA_ARGS__)

gfx/layers/composite/ImageHost.cpp

@@ -6,12 +6,13 @@
 
 #include "ImageHost.h"
 
+#include <utility>
+
 #include "LayersLogging.h"               // for AppendToString
 #include "composite/CompositableHost.h"  // for CompositableHost, etc
 #include "ipc/IPCMessageUtils.h"         // for null_t
-#include <utility>
-#include "mozilla/layers/Compositor.h"  // for Compositor
-#include "mozilla/layers/Effects.h"     // for TexturedEffect, Effect, etc
+#include "mozilla/layers/Compositor.h"   // for Compositor
+#include "mozilla/layers/Effects.h"      // for TexturedEffect, Effect, etc
 #include "mozilla/layers/LayerManagerComposite.h"  // for TexturedEffect, Effect, etc
 #include "nsAString.h"
 #include "nsDebug.h"          // for NS_WARNING, NS_ASSERTION

gfx/layers/ipc/LayersMessageUtils.h

@@ -7,13 +7,20 @@
 #ifndef mozilla_layers_LayersMessageUtils
 #define mozilla_layers_LayersMessageUtils
 
+#include <stdint.h>
+
+#include <utility>
+
 #include "FrameMetrics.h"
+#include "VsyncSource.h"
 #include "base/process_util.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "gfxTelemetry.h"
 #include "ipc/IPCMessageUtils.h"
 #include "ipc/nsGUIEventIPC.h"
 #include "mozilla/GfxMessageUtils.h"
+#include "mozilla/MotionPathUtils.h"
+#include "mozilla/ServoBindings.h"
 #include "mozilla/ipc/ByteBuf.h"
 #include "mozilla/layers/APZInputBridge.h"
 #include "mozilla/layers/APZTypes.h"
@@ -29,14 +36,7 @@
 #include "mozilla/layers/RefCountedShmem.h"
 #include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/layers/WebRenderMessageUtils.h"
-#include "mozilla/MotionPathUtils.h"
-#include "mozilla/ServoBindings.h"
-#include "VsyncSource.h"
-#include <utility>
 #include "nsSize.h"
-#include "VsyncSource.h"
-
-#include <stdint.h>
 
 #ifdef _MSC_VER
 #  pragma warning(disable : 4800)

gfx/layers/ipc/UiCompositorControllerParent.cpp

@@ -9,18 +9,18 @@
 #  include "apz/src/APZCTreeManager.h"
 #  include "mozilla/layers/AsyncCompositionManager.h"
 #endif
+#include <utility>
+
+#include "FrameMetrics.h"
+#include "SynchronousTask.h"
+#include "mozilla/Unused.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "mozilla/layers/UiCompositorControllerMessageTypes.h"
 #include "mozilla/layers/WebRenderBridgeParent.h"
-#include "mozilla/gfx/Types.h"
-#include <utility>
-#include "mozilla/Unused.h"
-
-#include "FrameMetrics.h"
-#include "SynchronousTask.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/wr/WebRenderImageHost.cpp

@@ -6,16 +6,17 @@
 
 #include "WebRenderImageHost.h"
 
-#include "LayersLogging.h"
 #include <utility>
+
+#include "LayersLogging.h"
 #include "mozilla/ScopeExit.h"
+#include "mozilla/layers/AsyncImagePipelineManager.h"
 #include "mozilla/layers/Compositor.h"                // for Compositor
 #include "mozilla/layers/CompositorVsyncScheduler.h"  // for CompositorVsyncScheduler
 #include "mozilla/layers/Effects.h"  // for TexturedEffect, Effect, etc
 #include "mozilla/layers/LayerManagerComposite.h"  // for TexturedEffect, Effect, etc
 #include "mozilla/layers/WebRenderBridgeParent.h"
 #include "mozilla/layers/WebRenderTextureHost.h"
-#include "mozilla/layers/AsyncImagePipelineManager.h"
 #include "nsAString.h"
 #include "nsDebug.h"          // for NS_WARNING, NS_ASSERTION
 #include "nsPrintfCString.h"  // for nsPrintfCString

gfx/src/TiledRegion.h

@@ -7,9 +7,10 @@
 #ifndef MOZILLA_GFX_TILEDREGION_H_
 #define MOZILLA_GFX_TILEDREGION_H_
 
+#include <utility>
+
 #include "mozilla/ArrayView.h"
 #include "mozilla/gfx/Rect.h"
-#include <utility>
 #include "nsRegion.h"
 #include "pixman.h"
 

gfx/src/nsRegion.h

@@ -10,21 +10,22 @@
 #include <stddef.h>     // for size_t
 #include <stdint.h>     // for uint32_t, uint64_t
 #include <sys/types.h>  // for int32_t
-#include <ostream>      // for std::ostream
-#include "nsCoord.h"    // for nscoord
-#include "nsError.h"    // for nsresult
-#include "nsPoint.h"    // for nsIntPoint, nsPoint
-#include "nsRect.h"     // for mozilla::gfx::IntRect, nsRect
-#include "nsRectAbsolute.h"
-#include "nsMargin.h"               // for nsIntMargin
-#include "nsRegionFwd.h"            // for nsIntRegion
-#include "nsString.h"               // for nsCString
-#include "mozilla/ArrayView.h"      // for ArrayView
-#include <utility>                  // for mozilla::Move
-#include "mozilla/gfx/MatrixFwd.h"  // for mozilla::gfx::Matrix4x4
-#include "mozilla/gfx/Logging.h"
-#include "nsTArray.h"
 
+#include <ostream>  // for std::ostream
+#include <utility>  // for mozilla::Move
+
+#include "mozilla/ArrayView.h"  // for ArrayView
+#include "mozilla/gfx/Logging.h"
+#include "mozilla/gfx/MatrixFwd.h"  // for mozilla::gfx::Matrix4x4
+#include "nsCoord.h"                // for nscoord
+#include "nsError.h"                // for nsresult
+#include "nsMargin.h"               // for nsIntMargin
+#include "nsPoint.h"                // for nsIntPoint, nsPoint
+#include "nsRect.h"                 // for mozilla::gfx::IntRect, nsRect
+#include "nsRectAbsolute.h"
+#include "nsRegionFwd.h"  // for nsIntRegion
+#include "nsString.h"     // for nsCString
+#include "nsTArray.h"
 #include "pixman.h"
 
 // Uncomment this line to get additional integrity checking.

image/AnimationFrameBuffer.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AnimationFrameBuffer.h"
+
 #include <utility>  // for Move
 
 namespace mozilla {

image/ClippedImage.cpp

@@ -6,22 +6,20 @@
 #include "ClippedImage.h"
 
 #include <algorithm>
-#include <new>  // Workaround for bug in VS10; see bug 981264.
 #include <cmath>
+#include <new>  // Workaround for bug in VS10; see bug 981264.
 #include <utility>
 
-#include "gfxDrawable.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "mozilla/gfx/2D.h"
-#include <utility>
-#include "mozilla/RefPtr.h"
-#include "mozilla/Pair.h"
-#include "mozilla/Tuple.h"
-
 #include "ImageRegion.h"
 #include "Orientation.h"
 #include "SVGImageContext.h"
+#include "gfxDrawable.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+#include "mozilla/Pair.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Tuple.h"
+#include "mozilla/gfx/2D.h"
 
 namespace mozilla {
 

image/FrameAnimator.cpp

@@ -6,11 +6,12 @@
 #include "FrameAnimator.h"
 
 #include <utility>
-#include "mozilla/CheckedInt.h"
-#include "mozilla/StaticPrefs_image.h"
-#include "imgIContainer.h"
+
 #include "LookupResult.h"
 #include "RasterImage.h"
+#include "imgIContainer.h"
+#include "mozilla/CheckedInt.h"
+#include "mozilla/StaticPrefs_image.h"
 
 namespace mozilla {
 

image/ImageCacheKey.cpp

@@ -5,21 +5,21 @@
 
 #include "ImageCacheKey.h"
 
-#include "mozilla/HashFunctions.h"
 #include <utility>
-#include "mozilla/Unused.h"
-#include "nsContentUtils.h"
-#include "nsLayoutUtils.h"
-#include "nsString.h"
+
 #include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/StorageAccess.h"
+#include "mozilla/Unused.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
-#include "mozilla/dom/Document.h"
+#include "nsContentUtils.h"
 #include "nsHashKeys.h"
+#include "nsLayoutUtils.h"
 #include "nsPrintfCString.h"
+#include "nsString.h"
 
 namespace mozilla {
 

image/LookupResult.h

@@ -11,10 +11,11 @@
 #ifndef mozilla_image_LookupResult_h
 #define mozilla_image_LookupResult_h
 
+#include <utility>
+
+#include "ISurfaceProvider.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/gfx/Point.h"  // for IntSize
-#include <utility>
-#include "ISurfaceProvider.h"
 
 namespace mozilla {
 namespace image {

image/RasterImage.cpp

@@ -5,52 +5,50 @@
 
 // Must #include ImageLogging.h before any IPDL-generated files or other files
 // that #include prlog.h
-#include "ImageLogging.h"
-
 #include "RasterImage.h"
 
-#include "gfxPlatform.h"
-#include "nsComponentManagerUtils.h"
-#include "nsError.h"
+#include <stdint.h>
+
+#include <algorithm>
+#include <utility>
+
 #include "DecodePool.h"
 #include "Decoder.h"
-#include "prenv.h"
-#include "prsystem.h"
+#include "FrameAnimator.h"
+#include "GeckoProfiler.h"
 #include "IDecodingTask.h"
+#include "ImageLogging.h"
 #include "ImageRegion.h"
 #include "Layers.h"
 #include "LookupResult.h"
+#include "SourceBuffer.h"
+#include "SurfaceCache.h"
+#include "gfx2DGlue.h"
+#include "gfxContext.h"
+#include "gfxPlatform.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Likely.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/SizeOfState.h"
+#include "mozilla/StaticPrefs_image.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Tuple.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Scale.h"
+#include "nsComponentManagerUtils.h"
+#include "nsError.h"
 #include "nsIConsoleService.h"
 #include "nsIInputStream.h"
 #include "nsIScriptError.h"
 #include "nsISupportsPrimitives.h"
 #include "nsMemory.h"
 #include "nsPresContext.h"
-#include "SourceBuffer.h"
-#include "SurfaceCache.h"
-#include "FrameAnimator.h"
-
-#include "gfxContext.h"
-
-#include "mozilla/gfx/2D.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/Likely.h"
-#include "mozilla/RefPtr.h"
-#include <utility>
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/SizeOfState.h"
-#include "mozilla/StaticPrefs_image.h"
-#include <stdint.h>
-#include "mozilla/Telemetry.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/Tuple.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/gfx/Scale.h"
-
-#include "GeckoProfiler.h"
-#include "gfx2DGlue.h"
 #include "nsProperties.h"
-#include <algorithm>
+#include "prenv.h"
+#include "prsystem.h"
 
 namespace mozilla {
 

image/SourceBuffer.h

@@ -12,15 +12,14 @@
 #define mozilla_image_sourcebuffer_h
 
 #include <algorithm>
+#include <utility>
+
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Mutex.h"
-#include <utility>
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/RefPtr.h"
 #include "mozilla/RefCounted.h"
-#include "mozilla/UniquePtr.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
 
 class nsIInputStream;

image/StreamingLexer.h

@@ -15,13 +15,14 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <utility>
+
+#include "SourceBuffer.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
-#include <utility>
 #include "mozilla/Variant.h"
 #include "mozilla/Vector.h"
-#include "SourceBuffer.h"
 
 namespace mozilla {
 namespace image {

image/SurfaceCache.cpp

@@ -10,32 +10,33 @@
 #include "SurfaceCache.h"
 
 #include <algorithm>
+#include <utility>
+
+#include "ISurfaceProvider.h"
+#include "Image.h"
+#include "LookupResult.h"
+#include "ShutdownTracker.h"
+#include "gfx2DGlue.h"
+#include "gfxPlatform.h"
+#include "imgFrame.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
-#include <utility>
 #include "mozilla/Pair.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_image.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Tuple.h"
-#include "nsIMemoryReporter.h"
-#include "gfx2DGlue.h"
-#include "gfxPlatform.h"
-#include "imgFrame.h"
-#include "Image.h"
-#include "ISurfaceProvider.h"
-#include "LookupResult.h"
 #include "nsExpirationTracker.h"
 #include "nsHashKeys.h"
+#include "nsIMemoryReporter.h"
 #include "nsRefPtrHashtable.h"
 #include "nsSize.h"
 #include "nsTArray.h"
 #include "prsystem.h"
-#include "ShutdownTracker.h"
 
 using std::max;
 using std::min;