Bug 1218454 - part 2 - don't #include nsContentUtils.h from CallbackObject.h; r=bz

We used to need nsContentUtils.h here for nsCxPusher, but since that got
moved to ScriptSettings.h, we no longer need nsContentUtils.h for
anything.
This commit is contained in:
Nathan Froyd 2015-10-26 12:14:47 -04:00
parent 21615e6ac9
commit 999dd36c0c
27 changed files with 26 additions and 1 deletions

View File

@ -12,6 +12,7 @@
#include "mozilla/Hal.h" #include "mozilla/Hal.h"
#include "mozilla/dom/BatteryManagerBinding.h" #include "mozilla/dom/BatteryManagerBinding.h"
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "nsContentUtils.h"
#include "nsIDOMClassInfo.h" #include "nsIDOMClassInfo.h"
#include "nsIDocument.h" #include "nsIDocument.h"

View File

@ -26,7 +26,6 @@
#include "mozilla/HoldDropJSObjects.h" #include "mozilla/HoldDropJSObjects.h"
#include "mozilla/MemoryReporting.h" #include "mozilla/MemoryReporting.h"
#include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/ScriptSettings.h"
#include "nsContentUtils.h"
#include "nsWrapperCache.h" #include "nsWrapperCache.h"
#include "nsJSEnvironment.h" #include "nsJSEnvironment.h"
#include "xpcpublic.h" #include "xpcpublic.h"

View File

@ -13,6 +13,7 @@
#include "mozilla/ipc/BackgroundChild.h" #include "mozilla/ipc/BackgroundChild.h"
#include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/ipc/BackgroundUtils.h"
#include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PBackgroundChild.h"
#include "nsContentUtils.h"
#include "WorkerPrivate.h" #include "WorkerPrivate.h"
#include "WorkerRunnable.h" #include "WorkerRunnable.h"

View File

@ -22,6 +22,7 @@
#include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/ipc/BackgroundUtils.h"
#include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PBackgroundChild.h"
#include "mozilla/ipc/PBackgroundSharedTypes.h" #include "mozilla/ipc/PBackgroundSharedTypes.h"
#include "nsContentUtils.h"
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsIGlobalObject.h" #include "nsIGlobalObject.h"
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"

View File

@ -12,6 +12,7 @@
#include "mozilla/ipc/BackgroundParent.h" #include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/ipc/PBackgroundParent.h" #include "mozilla/ipc/PBackgroundParent.h"
#include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/ipc/BackgroundUtils.h"
#include "nsContentUtils.h"
#include "nsIPrincipal.h" #include "nsIPrincipal.h"
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"

View File

@ -13,6 +13,7 @@
#include "mozilla/ErrorResult.h" #include "mozilla/ErrorResult.h"
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "AccessCheck.h" #include "AccessCheck.h"
#include "nsContentUtils.h"
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {

View File

@ -14,6 +14,7 @@
#include "nsIPrincipal.h" #include "nsIPrincipal.h"
#include "nsPrintfCString.h" #include "nsPrintfCString.h"
#include "nsIURI.h" #include "nsIURI.h"
#include "nsContentUtils.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"
#include "TabParent.h" #include "TabParent.h"

View File

@ -8,6 +8,7 @@
#include "mozilla/dom/AudioBufferSourceNodeBinding.h" #include "mozilla/dom/AudioBufferSourceNodeBinding.h"
#include "mozilla/dom/AudioParam.h" #include "mozilla/dom/AudioParam.h"
#include "mozilla/FloatingPoint.h" #include "mozilla/FloatingPoint.h"
#include "nsContentUtils.h"
#include "nsMathUtils.h" #include "nsMathUtils.h"
#include "AudioNodeEngine.h" #include "AudioNodeEngine.h"
#include "AudioNodeStream.h" #include "AudioNodeStream.h"

View File

@ -34,6 +34,7 @@
#include "MediaStreamAudioDestinationNode.h" #include "MediaStreamAudioDestinationNode.h"
#include "MediaStreamAudioSourceNode.h" #include "MediaStreamAudioSourceNode.h"
#include "MediaStreamGraph.h" #include "MediaStreamGraph.h"
#include "nsContentUtils.h"
#include "nsNetCID.h" #include "nsNetCID.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsPIDOMWindow.h" #include "nsPIDOMWindow.h"

View File

@ -17,6 +17,7 @@
#include "AudioContext.h" #include "AudioContext.h"
#include "AudioBuffer.h" #include "AudioBuffer.h"
#include "nsAutoPtr.h" #include "nsAutoPtr.h"
#include "nsContentUtils.h"
#include "nsIScriptObjectPrincipal.h" #include "nsIScriptObjectPrincipal.h"
#include "nsIScriptError.h" #include "nsIScriptError.h"
#include "nsMimeTypes.h" #include "nsMimeTypes.h"

View File

@ -8,6 +8,7 @@
#include "AudioNodeEngine.h" #include "AudioNodeEngine.h"
#include "AudioNodeStream.h" #include "AudioNodeStream.h"
#include "AudioDestinationNode.h" #include "AudioDestinationNode.h"
#include "nsContentUtils.h"
#include "WebAudioUtils.h" #include "WebAudioUtils.h"
#include "blink/PeriodicWave.h" #include "blink/PeriodicWave.h"

View File

@ -7,6 +7,7 @@
#include "MediaDecoderStateMachine.h" #include "MediaDecoderStateMachine.h"
#include "AbstractMediaDecoder.h" #include "AbstractMediaDecoder.h"
#include "SoftwareWebMVideoDecoder.h" #include "SoftwareWebMVideoDecoder.h"
#include "nsContentUtils.h"
#include "WebMReader.h" #include "WebMReader.h"
#include "WebMBufferedParser.h" #include "WebMBufferedParser.h"
#include "gfx2DGlue.h" #include "gfx2DGlue.h"

View File

@ -14,6 +14,7 @@
#include "mozilla/dom/TCPSocketEvent.h" #include "mozilla/dom/TCPSocketEvent.h"
#include "mozilla/dom/TCPSocketEventBinding.h" #include "mozilla/dom/TCPSocketEventBinding.h"
#include "mozilla/dom/ToJSValue.h" #include "mozilla/dom/ToJSValue.h"
#include "nsContentUtils.h"
#include "nsIArrayBufferInputStream.h" #include "nsIArrayBufferInputStream.h"
#include "nsISocketTransportService.h" #include "nsISocketTransportService.h"
#include "nsISocketTransport.h" #include "nsISocketTransport.h"

View File

@ -6,6 +6,7 @@
#include "mozilla/AsyncEventDispatcher.h" #include "mozilla/AsyncEventDispatcher.h"
#include "mozilla/dom/MessageEvent.h" #include "mozilla/dom/MessageEvent.h"
#include "nsContentUtils.h"
#include "nsCycleCollectionParticipant.h" #include "nsCycleCollectionParticipant.h"
#include "nsIPresentationService.h" #include "nsIPresentationService.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"

View File

@ -12,6 +12,7 @@
#include "mozilla/Move.h" #include "mozilla/Move.h"
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/Services.h" #include "mozilla/Services.h"
#include "nsContentUtils.h"
#include "nsIDocShell.h" #include "nsIDocShell.h"
#include "nsIFrameLoader.h" #include "nsIFrameLoader.h"
#include "nsIMutableArray.h" #include "nsIMutableArray.h"

View File

@ -8,6 +8,7 @@
#define mozilla_dom_PresentationSessionInfo_h #define mozilla_dom_PresentationSessionInfo_h
#include "base/process.h" #include "base/process.h"
#include "mozilla/dom/nsIContentParent.h"
#include "mozilla/dom/Promise.h" #include "mozilla/dom/Promise.h"
#include "mozilla/dom/PromiseNativeHandler.h" #include "mozilla/dom/PromiseNativeHandler.h"
#include "mozilla/RefPtr.h" #include "mozilla/RefPtr.h"

View File

@ -42,6 +42,7 @@
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"
#include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h"
#include "nsContentUtils.h"
#include "nsXULAppAPI.h" #include "nsXULAppAPI.h"
#include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/SettingChangeNotificationBinding.h" #include "mozilla/dom/SettingChangeNotificationBinding.h"

View File

@ -14,6 +14,7 @@
#include "mozilla/layers/LayerTransactionChild.h" #include "mozilla/layers/LayerTransactionChild.h"
#include "mozilla/layers/ShadowLayers.h" #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/TouchEvents.h" #include "mozilla/TouchEvents.h"
#include "nsContentUtils.h"
#include "nsIScrollableFrame.h" #include "nsIScrollableFrame.h"
#include "nsLayoutUtils.h" #include "nsLayoutUtils.h"
#include "nsIInterfaceRequestorUtils.h" #include "nsIInterfaceRequestorUtils.h"

View File

@ -8,6 +8,7 @@
#include "AccessCheck.h" #include "AccessCheck.h"
#include "WrapperFactory.h" #include "WrapperFactory.h"
#include "nsContentUtils.h"
#include "nsIControllers.h" #include "nsIControllers.h"
#include "nsDependentString.h" #include "nsDependentString.h"
#include "nsIScriptError.h" #include "nsIScriptError.h"

View File

@ -47,6 +47,7 @@
#include "SpdyZlibReporter.h" #include "SpdyZlibReporter.h"
#include "nsIMemoryReporter.h" #include "nsIMemoryReporter.h"
#include "nsIParentalControlsService.h" #include "nsIParentalControlsService.h"
#include "nsPIDOMWindow.h"
#include "nsINetworkLinkService.h" #include "nsINetworkLinkService.h"
#include "nsHttpChannelAuthProvider.h" #include "nsHttpChannelAuthProvider.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"

View File

@ -12,6 +12,7 @@
#include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentChild.h"
#include "nsCharsetSource.h" #include "nsCharsetSource.h"
#include "nsContentUtils.h"
#include "nsStringStream.h" #include "nsStringStream.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsISerializable.h" #include "nsISerializable.h"

View File

@ -11,6 +11,7 @@
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"
#include "nsCOMArray.h" #include "nsCOMArray.h"
#include "nsContentUtils.h"
#include "nsIMutableArray.h" #include "nsIMutableArray.h"
#include "nsReadableUtils.h" #include "nsReadableUtils.h"

View File

@ -10,6 +10,7 @@
#include "mozilla/dom/TabParent.h" #include "mozilla/dom/TabParent.h"
#include "mozilla/ipc/URIUtils.h" #include "mozilla/ipc/URIUtils.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"
#include "nsContentUtils.h"
#include "nsOfflineCacheUpdate.h" #include "nsOfflineCacheUpdate.h"
#include "nsIApplicationCache.h" #include "nsIApplicationCache.h"
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"

View File

@ -19,6 +19,7 @@
#include "mozilla/TextEvents.h" #include "mozilla/TextEvents.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"
#include "PuppetWidget.h" #include "PuppetWidget.h"
#include "nsContentUtils.h"
#include "nsIWidgetListener.h" #include "nsIWidgetListener.h"
using namespace mozilla; using namespace mozilla;

View File

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/unused.h" #include "mozilla/unused.h"
#include "nsContentUtils.h"
#include "nsIAppShell.h" #include "nsIAppShell.h"
#include "nsScreenManagerProxy.h" #include "nsScreenManagerProxy.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"

View File

@ -8,6 +8,7 @@
#include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentChild.h"
#include "nsScreenManagerProxy.h" #include "nsScreenManagerProxy.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"
#include "nsContentUtils.h"
#include "nsIAppShell.h" #include "nsIAppShell.h"
#include "nsIScreen.h" #include "nsIScreen.h"
#include "nsIScreenManager.h" #include "nsIScreenManager.h"

View File

@ -67,6 +67,7 @@
#include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/ScriptSettings.h"
#include "jsprf.h" #include "jsprf.h"
#include "js/Debug.h" #include "js/Debug.h"
#include "nsContentUtils.h"
#include "nsCycleCollectionNoteRootCallback.h" #include "nsCycleCollectionNoteRootCallback.h"
#include "nsCycleCollectionParticipant.h" #include "nsCycleCollectionParticipant.h"
#include "nsCycleCollector.h" #include "nsCycleCollector.h"