From 088b9fe162bfd91fee5ca6f112f51abeb6f9b1e8 Mon Sep 17 00:00:00 2001 From: Catalin Iacob Date: Sun, 30 Jun 2013 18:26:39 +0200 Subject: [PATCH] Bug 798914 (part 6) - Followup: move MemoryReporting.h include after the cpp's own header include. r=njn. --- caps/src/nsNullPrincipalURI.cpp | 4 +++- content/base/src/nsAttrAndChildArray.cpp | 4 +++- content/base/src/nsPropertyTable.cpp | 4 +++- content/html/content/src/HTMLAnchorElement.cpp | 3 ++- content/html/content/src/HTMLAreaElement.cpp | 3 ++- content/html/content/src/HTMLLinkElement.cpp | 2 +- gfx/thebes/gfxDWriteFonts.cpp | 4 +++- gfx/thebes/gfxGDIFont.cpp | 4 +++- gfx/thebes/gfxMacFont.cpp | 4 +++- image/src/ImageWrapper.cpp | 3 ++- layout/base/FramePropertyTable.cpp | 4 +++- layout/base/StackArena.cpp | 3 ++- layout/generic/nsTextRunTransformations.cpp | 3 ++- layout/style/StyleRule.cpp | 3 ++- layout/style/nsAnimationManager.cpp | 4 +++- xpcom/glue/nsCOMArray.cpp | 4 +++- 16 files changed, 40 insertions(+), 16 deletions(-) diff --git a/caps/src/nsNullPrincipalURI.cpp b/caps/src/nsNullPrincipalURI.cpp index bf52ecab7eb..28d7ff5ddf6 100644 --- a/caps/src/nsNullPrincipalURI.cpp +++ b/caps/src/nsNullPrincipalURI.cpp @@ -4,8 +4,10 @@ * 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/MemoryReporting.h" #include "nsNullPrincipalURI.h" + +#include "mozilla/MemoryReporting.h" + #include "nsNetUtil.h" #include "nsEscape.h" #include "nsCRT.h" diff --git a/content/base/src/nsAttrAndChildArray.cpp b/content/base/src/nsAttrAndChildArray.cpp index cb9ff3786ba..4275cd9eda8 100644 --- a/content/base/src/nsAttrAndChildArray.cpp +++ b/content/base/src/nsAttrAndChildArray.cpp @@ -8,8 +8,10 @@ * the two is unified to minimize footprint. */ -#include "mozilla/MemoryReporting.h" #include "nsAttrAndChildArray.h" + +#include "mozilla/MemoryReporting.h" + #include "nsMappedAttributeElement.h" #include "prbit.h" #include "nsString.h" diff --git a/content/base/src/nsPropertyTable.cpp b/content/base/src/nsPropertyTable.cpp index af4b504f919..9808ddd7efb 100644 --- a/content/base/src/nsPropertyTable.cpp +++ b/content/base/src/nsPropertyTable.cpp @@ -20,8 +20,10 @@ * nsIAtom pointers, and the values are void pointers. */ -#include "mozilla/MemoryReporting.h" #include "nsPropertyTable.h" + +#include "mozilla/MemoryReporting.h" + #include "pldhash.h" #include "nsError.h" #include "nsIAtom.h" diff --git a/content/html/content/src/HTMLAnchorElement.cpp b/content/html/content/src/HTMLAnchorElement.cpp index d2d7515de3c..e60f47b312c 100644 --- a/content/html/content/src/HTMLAnchorElement.cpp +++ b/content/html/content/src/HTMLAnchorElement.cpp @@ -4,8 +4,9 @@ * 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/MemoryReporting.h" #include "mozilla/dom/HTMLAnchorElement.h" + +#include "mozilla/MemoryReporting.h" #include "mozilla/dom/HTMLAnchorElementBinding.h" #include "nsCOMPtr.h" diff --git a/content/html/content/src/HTMLAreaElement.cpp b/content/html/content/src/HTMLAreaElement.cpp index b5df88361c3..c6530fabe8c 100644 --- a/content/html/content/src/HTMLAreaElement.cpp +++ b/content/html/content/src/HTMLAreaElement.cpp @@ -4,8 +4,9 @@ * 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/MemoryReporting.h" #include "mozilla/dom/HTMLAreaElement.h" + +#include "mozilla/MemoryReporting.h" #include "mozilla/dom/HTMLAreaElementBinding.h" #include "base/compiler_specific.h" diff --git a/content/html/content/src/HTMLLinkElement.cpp b/content/html/content/src/HTMLLinkElement.cpp index 320b6894f31..a5baa1c471f 100644 --- a/content/html/content/src/HTMLLinkElement.cpp +++ b/content/html/content/src/HTMLLinkElement.cpp @@ -3,9 +3,9 @@ * 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/MemoryReporting.h" #include "mozilla/dom/HTMLLinkElement.h" +#include "mozilla/MemoryReporting.h" #include "mozilla/dom/HTMLLinkElementBinding.h" #include "base/compiler_specific.h" #include "nsGenericHTMLElement.h" diff --git a/gfx/thebes/gfxDWriteFonts.cpp b/gfx/thebes/gfxDWriteFonts.cpp index 47fb0363128..094a98aa71e 100644 --- a/gfx/thebes/gfxDWriteFonts.cpp +++ b/gfx/thebes/gfxDWriteFonts.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "gfxDWriteFonts.h" + +#include "mozilla/MemoryReporting.h" + #include "gfxDWriteShaper.h" #include "gfxHarfBuzzShaper.h" #include diff --git a/gfx/thebes/gfxGDIFont.cpp b/gfx/thebes/gfxGDIFont.cpp index 2550823bbe4..9a2428285be 100644 --- a/gfx/thebes/gfxGDIFont.cpp +++ b/gfx/thebes/gfxGDIFont.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "gfxGDIFont.h" + +#include "mozilla/MemoryReporting.h" + #include "gfxGDIShaper.h" #include "gfxUniscribeShaper.h" #include "gfxHarfBuzzShaper.h" diff --git a/gfx/thebes/gfxMacFont.cpp b/gfx/thebes/gfxMacFont.cpp index 7bae46d125a..80c863c6787 100644 --- a/gfx/thebes/gfxMacFont.cpp +++ b/gfx/thebes/gfxMacFont.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "gfxMacFont.h" + +#include "mozilla/MemoryReporting.h" + #include "gfxCoreTextShaper.h" #include "gfxHarfBuzzShaper.h" #include diff --git a/image/src/ImageWrapper.cpp b/image/src/ImageWrapper.cpp index 332a7f8e831..5055b278468 100644 --- a/image/src/ImageWrapper.cpp +++ b/image/src/ImageWrapper.cpp @@ -3,9 +3,10 @@ * 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/MemoryReporting.h" #include "ImageWrapper.h" +#include "mozilla/MemoryReporting.h" + using mozilla::layers::LayerManager; using mozilla::layers::ImageContainer; diff --git a/layout/base/FramePropertyTable.cpp b/layout/base/FramePropertyTable.cpp index b387ce9769d..ffe6c765850 100644 --- a/layout/base/FramePropertyTable.cpp +++ b/layout/base/FramePropertyTable.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "FramePropertyTable.h" + +#include "mozilla/MemoryReporting.h" + #include "prlog.h" namespace mozilla { diff --git a/layout/base/StackArena.cpp b/layout/base/StackArena.cpp index c709538d21d..55aa3d8e335 100644 --- a/layout/base/StackArena.cpp +++ b/layout/base/StackArena.cpp @@ -2,9 +2,10 @@ * 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/MemoryReporting.h" #include "StackArena.h" +#include "mozilla/MemoryReporting.h" + namespace mozilla { #define STACK_ARENA_MARK_INCREMENT 50 diff --git a/layout/generic/nsTextRunTransformations.cpp b/layout/generic/nsTextRunTransformations.cpp index f684f7d2554..1932ed51e55 100644 --- a/layout/generic/nsTextRunTransformations.cpp +++ b/layout/generic/nsTextRunTransformations.cpp @@ -3,9 +3,10 @@ * 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/MemoryReporting.h" #include "nsTextRunTransformations.h" +#include "mozilla/MemoryReporting.h" + #include "nsTextFrameUtils.h" #include "gfxSkipChars.h" #include "nsGkAtoms.h" diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index 680096a027d..441f8e808c2 100644 --- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -9,8 +9,9 @@ * declarations */ -#include "mozilla/MemoryReporting.h" #include "mozilla/css/StyleRule.h" + +#include "mozilla/MemoryReporting.h" #include "mozilla/css/GroupRule.h" #include "mozilla/css/Declaration.h" #include "nsCSSStyleSheet.h" diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index af7d55a3de8..1a69db2cd47 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "nsAnimationManager.h" + +#include "mozilla/MemoryReporting.h" + #include "nsPresContext.h" #include "nsRuleProcessorData.h" #include "nsStyleSet.h" diff --git a/xpcom/glue/nsCOMArray.cpp b/xpcom/glue/nsCOMArray.cpp index 35bf7ee8a80..99b1b5e481a 100644 --- a/xpcom/glue/nsCOMArray.cpp +++ b/xpcom/glue/nsCOMArray.cpp @@ -3,8 +3,10 @@ * 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/MemoryReporting.h" #include "nsCOMArray.h" + +#include "mozilla/MemoryReporting.h" + #include "nsCOMPtr.h" // This specialization is private to nsCOMArray.