Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar

shellylin · Aug 14, 2013 · 1a5ae52 · 1a5ae52
1 parent 682a633
commit 1a5ae52
Show file tree

Hide file tree

Showing 130 changed files with 44 additions and 171 deletions.
diff --git a/accessible/src/generic/Accessible.cpp b/accessible/src/generic/Accessible.cpp
@@ -26,7 +26,6 @@
 #include "TableCellAccessible.h"
 #include "TreeWalker.h"
 
-#include "nsContentUtils.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMNodeFilter.h"

diff --git a/caps/src/nsPrincipal.cpp b/caps/src/nsPrincipal.cpp
@@ -4,31 +4,24 @@
  * 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 "nsPrincipal.h"
+
 #include "mozIThirdPartyUtil.h"
 #include "nscore.h"
 #include "nsScriptSecurityManager.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "plstr.h"
 #include "pratom.h"
-#include "nsCRT.h"
 #include "nsIURI.h"
-#include "nsIFileURL.h"
-#include "nsIProtocolHandler.h"
-#include "nsNetUtil.h"
 #include "nsJSPrincipals.h"
-#include "nsVoidArray.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
 #include "nsIClassInfoImpl.h"
 #include "nsError.h"
 #include "nsIContentSecurityPolicy.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "jswrapper.h"
 
-#include "nsPrincipal.h"
-
 #include "mozilla/Preferences.h"
 #include "mozilla/HashFunctions.h"
 

diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp
@@ -26,7 +26,6 @@
 #include "nsIDocument.h"
 #include "jsfriendapi.h"
 #include "xpcprivate.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"

diff --git a/content/base/src/DirectionalityUtils.cpp b/content/base/src/DirectionalityUtils.cpp
@@ -205,6 +205,7 @@
   */
 
 #include "mozilla/dom/DirectionalityUtils.h"
+
 #include "nsINode.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
@@ -214,7 +215,6 @@
 #include "nsUnicodeProperties.h"
 #include "nsTextFragment.h"
 #include "nsAttrValue.h"
-#include "nsContentUtils.h"
 #include "nsTextNode.h"
 #include "nsCheapSets.h"
 

diff --git a/content/base/src/DocumentFragment.cpp b/content/base/src/DocumentFragment.cpp
@@ -15,7 +15,7 @@
 #include "nsError.h"
 #include "nsGkAtoms.h"
 #include "nsDOMString.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_INTERFACE_MAP_ENTRY_TEAROFF
 #include "mozilla/dom/DocumentFragmentBinding.h"
 
 namespace mozilla {

diff --git a/content/base/src/nsDOMCaretPosition.cpp b/content/base/src/nsDOMCaretPosition.cpp
@@ -3,8 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMCaretPosition.h"
+
 #include "mozilla/dom/CaretPositionBinding.h"
-#include "nsContentUtils.h"
+#include "nsClientRect.h"
+#include "nsRange.h"
 
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
   : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)

diff --git a/content/base/src/nsDOMCaretPosition.h b/content/base/src/nsDOMCaretPosition.h
@@ -8,10 +8,9 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsINode.h"
-#include "nsRange.h"
 #include "nsWrapperCache.h"
-#include "nsRect.h"
-#include "nsClientRect.h"
+
+class nsClientRect;
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within

diff --git a/content/base/src/nsFormData.cpp b/content/base/src/nsFormData.cpp
@@ -8,7 +8,6 @@
 #include "nsIDOMFile.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/dom/FormDataBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp
@@ -18,7 +18,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIPrincipal.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for kLoadAsData
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsAutoPtr.h"

diff --git a/content/canvas/src/ImageData.cpp b/content/canvas/src/ImageData.cpp
@@ -6,8 +6,7 @@
 
 #include "mozilla/dom/ImageData.h"
 
-#include "nsDOMClassInfoID.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_HOLD_JS_OBJECTS, NS_DROP_JS_OBJECTS
 #include "mozilla/dom/ImageDataBinding.h"
 
 #include "jsapi.h"

diff --git a/content/canvas/src/WebGLBuffer.cpp b/content/canvas/src/WebGLBuffer.cpp
@@ -6,7 +6,6 @@
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLExtensionBase.cpp b/content/canvas/src/WebGLExtensionBase.cpp
@@ -5,7 +5,6 @@
 
 #include "WebGLContext.h"
 #include "WebGLExtensions.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLFramebuffer.cpp b/content/canvas/src/WebGLFramebuffer.cpp
@@ -9,7 +9,6 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 #include "WebGLTexture.h"
 #include "WebGLRenderbuffer.h"
 

diff --git a/content/canvas/src/WebGLProgram.cpp b/content/canvas/src/WebGLProgram.cpp
@@ -7,7 +7,6 @@
 #include "WebGLShader.h"
 #include "WebGLProgram.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLRenderbuffer.cpp b/content/canvas/src/WebGLRenderbuffer.cpp
@@ -7,7 +7,6 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLShader.cpp b/content/canvas/src/WebGLShader.cpp
@@ -8,7 +8,6 @@
 #include "WebGLContext.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLTexture.cpp b/content/canvas/src/WebGLTexture.cpp
@@ -7,7 +7,6 @@
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include <algorithm>
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/canvas/src/WebGLVertexArray.cpp b/content/canvas/src/WebGLVertexArray.cpp
@@ -7,7 +7,6 @@
 #include "WebGLBuffer.h"
 #include "WebGLVertexArray.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

diff --git a/content/events/src/DOMWheelEvent.cpp b/content/events/src/DOMWheelEvent.cpp
@@ -7,7 +7,6 @@
 #include "DOMWheelEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsContentUtils.h"
 #include "prtime.h"
 
 namespace mozilla {

diff --git a/content/events/src/nsDOMClipboardEvent.cpp b/content/events/src/nsDOMClipboardEvent.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMClipboardEvent.h"
-#include "nsContentUtils.h"
 #include "nsClientRect.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIClipboard.h"

diff --git a/content/events/src/nsDOMMessageEvent.cpp b/content/events/src/nsDOMMessageEvent.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMMessageEvent.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_HOLD_JS_OBJECTS, NS_DROP_JS_OBJECTS
 #include "jsapi.h"
 
 using namespace mozilla;

diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp
@@ -8,7 +8,6 @@
 #include "nsIVariant.h"
 #include "nsIServiceManager.h"
 #include "nsMemory.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsIXPConnect.h"
 #include "nsIDOMWindow.h"

diff --git a/content/events/src/nsPaintRequest.cpp b/content/events/src/nsPaintRequest.cpp
@@ -6,7 +6,6 @@
 #include "nsPaintRequest.h"
 
 #include "nsIFrame.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/PaintRequestBinding.h"
 #include "mozilla/dom/PaintRequestListBinding.h"
 

diff --git a/content/html/content/src/HTMLTimeElement.cpp b/content/html/content/src/HTMLTimeElement.cpp
@@ -5,7 +5,6 @@
 
 #include "HTMLTimeElement.h"
 #include "mozilla/dom/HTMLTimeElementBinding.h"
-#include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
 #include "nsVariant.h"
 #include "nsGkAtoms.h"

diff --git a/content/html/content/src/TimeRanges.cpp b/content/html/content/src/TimeRanges.cpp
@@ -7,8 +7,6 @@
 #include "mozilla/dom/TimeRanges.h"
 #include "mozilla/dom/TimeRangesBinding.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 #include "nsError.h"
 
 namespace mozilla {

diff --git a/content/html/content/src/ValidityState.cpp b/content/html/content/src/ValidityState.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/dom/ValidityStateBinding.h"
 
 #include "nsCycleCollectionParticipant.h"
-#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {

diff --git a/content/html/content/src/nsClientRect.cpp b/content/html/content/src/nsClientRect.cpp
@@ -4,8 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsClientRect.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 
 #include "nsPresContext.h"
 #include "mozilla/dom/ClientRectListBinding.h"

diff --git a/content/media/VideoPlaybackQuality.cpp b/content/media/VideoPlaybackQuality.cpp
@@ -8,7 +8,6 @@
 
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/VideoPlaybackQualityBinding.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "MediaDecoder.h"

diff --git a/content/media/mediasource/MediaSource.cpp b/content/media/mediasource/MediaSource.cpp
@@ -10,7 +10,6 @@
 #include "MediaSourceInputAdapter.h"
 #include "SourceBuffer.h"
 #include "SourceBufferList.h"
-#include "nsContentUtils.h"
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* gMediaSourceLog;

diff --git a/content/media/mediasource/SourceBuffer.cpp b/content/media/mediasource/SourceBuffer.cpp
@@ -5,8 +5,6 @@
 
 #include "SourceBuffer.h"
 
-#include "nsContentUtils.h"
-
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaSourceLog;
 #define LOG(type, msg) PR_LOG(gMediaSourceLog, type, msg)

diff --git a/content/media/mediasource/SourceBufferList.cpp b/content/media/mediasource/SourceBufferList.cpp
@@ -7,7 +7,6 @@
 #include "SourceBufferList.h"
 
 #include "mozilla/dom/SourceBufferListBinding.h"
-#include "nsContentUtils.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaSourceLog;

diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "nsPIDOMWindow.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AnalyserNode.h"

diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
@@ -6,7 +6,6 @@
 
 #include "AudioListener.h"
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioListenerBinding.h"
 

diff --git a/content/media/webaudio/AudioNode.cpp b/content/media/webaudio/AudioNode.cpp
@@ -6,7 +6,6 @@
 
 #include "AudioNode.h"
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioNodeStream.h"
 

diff --git a/content/media/webaudio/AudioParam.cpp b/content/media/webaudio/AudioParam.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioParam.h"
-#include "nsContentUtils.h"
 #include "nsIDOMWindow.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioParamBinding.h"

diff --git a/content/media/webspeech/recognition/SpeechGrammar.cpp b/content/media/webspeech/recognition/SpeechGrammar.cpp
@@ -6,8 +6,6 @@
 
 #include "SpeechGrammar.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/SpeechGrammarBinding.h"
 

diff --git a/content/media/webspeech/recognition/SpeechGrammarList.cpp b/content/media/webspeech/recognition/SpeechGrammarList.cpp
@@ -6,8 +6,6 @@
 
 #include "SpeechGrammarList.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechGrammarListBinding.h"
 
 namespace mozilla {

diff --git a/content/media/webspeech/recognition/SpeechRecognition.cpp b/content/media/webspeech/recognition/SpeechRecognition.cpp
@@ -7,7 +7,6 @@
 #include "SpeechRecognition.h"
 
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 
 #include "mozilla/dom/SpeechRecognitionBinding.h"

diff --git a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
@@ -6,8 +6,6 @@
 
 #include "SpeechRecognitionAlternative.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechRecognitionAlternativeBinding.h"
 
 #include "SpeechRecognition.h"

diff --git a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp b/content/media/webspeech/recognition/SpeechRecognitionResult.cpp
@@ -4,8 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsContentUtils.h"
-
 #include "SpeechRecognitionResult.h"
 #include "mozilla/dom/SpeechRecognitionResultBinding.h"
 

diff --git a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp
@@ -6,8 +6,6 @@
 
 #include "SpeechRecognitionResultList.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechRecognitionResultListBinding.h"
 
 #include "SpeechRecognition.h"

diff --git a/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp b/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
 

diff --git a/content/svg/content/nsISVGPoint.cpp b/content/svg/content/nsISVGPoint.cpp
@@ -9,7 +9,6 @@
 #include "SVGAnimatedPointList.h"
 #include "nsSVGElement.h"
 #include "nsError.h"
-#include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "mozilla/dom/SVGMatrix.h"
 #include "mozilla/dom/SVGPointBinding.h"